Add {{CURRENTTIMESTAMP}} magic word

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d8f9bf0..5bdffdc 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -323,6 +323,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   changes as patrolled using the diff links there
 * Add 'DiffViewHeader' hook called before diff page output
 * (bug 6051) Improvement to German localisation (de)
+* Add {{CURRENTTIMESTAMP}} magic word
 
 == Compatibility ==
 

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 895c0e0..f8b47c3 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -89,6 +89,7 @@ $magicWords = array(
        'MAG_BASEPAGENAME',
        'MAG_BASEPAGENAMEE',
        'MAG_URLENCODE',
+       'MAG_CURRENTTIMESTAMP',
 );
 if ( ! defined( 'MEDIAWIKI_INSTALL' ) )
        wfRunHooks( 'MagicWordMagicWords', array( &$magicWords ) );
@@ -140,6 +141,7 @@ $wgVariableIDs = array(
        MAG_BASEPAGENAME,
        MAG_BASEPAGENAMEE,
        MAG_URLENCODE,
+       MAG_CURRENTTIMESTAMP,
 );
 if ( ! defined( 'MEDIAWIKI_INSTALL' ) )
        wfRunHooks( 'MagicWordwgVariableIDs', array( &$wgVariableIDs ) );

diff --git a/includes/Parser.php b/includes/Parser.php
index 2bc29bf..bd54cfc 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -2166,6 +2166,8 @@ class Parser
                                return $varCache[$index] = $wgContLang->formatNum( wfNumberOfUsers() );
                        case MAG_NUMBEROFPAGES:
                                return $varCache[$index] = $wgContLang->formatNum( wfNumberOfPages() );
+                       case MAG_CURRENTTIMESTAMP:
+                               return $varCache[$index] = wfTimestampNow();
                        case MAG_CURRENTVERSION:
                                global $wgVersion;
                                return $wgVersion;

diff --git a/languages/Language.php b/languages/Language.php
index c2b9c84..f135dd4 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -287,6 +287,7 @@ $wgLanguageNamesEn =& $wgLanguageNames;
        MAG_NEWSECTIONLINK               => array( 1,    '__NEWSECTIONLINK__'     ),
        MAG_CURRENTVERSION               => array( 1,    'CURRENTVERSION'                 ),
        MAG_URLENCODE                    => array( 0,    'URLENCODE:'                     ),
+       MAG_CURRENTTIMESTAMP     => array( 1,    'CURRENTTIMESTAMP'               ),
 );
 
 if (!$wgCachedMessageArrays) {