* (bug 4594) date("W", ..) is zero padded in PHP5, not so in PHP4, removing

  the padding

diff --git a/includes/Parser.php b/includes/Parser.php
index c9f3d21..099d46d 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1977,7 +1977,9 @@ class Parser
                        case MAG_CURRENTTIME:
                                return $varCache[$index] = $wgContLang->time( wfTimestamp( TS_MW, $ts ), false, false );
                        case MAG_CURRENTWEEK:
-                               return $varCache[$index] = $wgContLang->formatNum( date( 'W', $ts ) );
+                               // @bug 4594 PHP5 has it zero padded, PHP4 does not, cast to
+                               // int to remove the padding
+                               return $varCache[$index] = $wgContLang->formatNum( (int)date( 'W', $ts ) );
                        case MAG_CURRENTDOW:
                                return $varCache[$index] = $wgContLang->formatNum( date( 'w', $ts ) );
                        case MAG_NUMBEROFARTICLES:

diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 00c568d..253a1bf 100644 (file)
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -1413,11 +1413,11 @@ Magic Word: {{CURRENTTIME}}
 !! end
 
 !! test
-Magic Word: {{CURRENTWEEK}}
+Magic Word: {{CURRENTWEEK}} (@bug 4594)
 !! input
 {{CURRENTWEEK}}
 !! result
-<p>01
+<p>1
 </p>
 !! end