Revert r70533 and the piece of r70501 that it tried to fix. Note and open bug for...

This has been present since introduction of {{#formatdate: }} in r48249 (bug 4582)

diff --git a/includes/User.php b/includes/User.php
index 1edbb9f..3df7d20 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -2705,7 +2705,7 @@ class User {
 
                $confstr =        $this->getOption( 'math' );
                $confstr .= '!' . $this->getStubThreshold();
-               if ( $wgUseDynamicDates ) {
+               if ( $wgUseDynamicDates ) { # This is wrong (bug 24714)
                        $confstr .= '!' . $this->getDatePreference();
                }
                $confstr .= '!' . ( $this->getOption( 'numberheadings' ) ? '1' : '' );

diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index 0ec99c5..c8c13e6 100644 (file)
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -71,10 +71,6 @@ class ParserOptions {
        }
 
        function getDateFormat() {
-               if ( !$this->getUseDynamicDates() ) {
-                       throw new MWException( 'Getting DateFormat option without UseDynamicDates.' );
-               }
-               
                if ( !isset( $this->mDateFormat ) ) {
                        $this->mDateFormat = $this->mUser->getDatePreference();
                }

diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index ca576ca..12a2cd1 100644 (file)
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -7792,8 +7792,6 @@ wgUseDynamicDates=1
 
 !!test
 formatdate parser function
-!! config
-wgUseDynamicDates=1
 !!input
 {{#formatdate:2009-03-24}}
 !! result
@@ -7803,8 +7801,6 @@ wgUseDynamicDates=1
 
 !!test
 formatdate parser function, with default format
-!! config
-wgUseDynamicDates=1
 !!input
 {{#formatdate:2009-03-24|mdy}}
 !! result
@@ -7825,8 +7821,6 @@ wgUseDynamicDates=false
 
 !! test
 Spacing of numbers in formatted dates
-!! config
-wgUseDynamicDates=1
 !! input
 {{#formatdate:January 15}}
 !! result