fix fatal error in Special:Preferences if $wgDefaultUserOptions['date'] is not valid...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d964071..ac35de5 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -99,6 +99,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 23078) "All public logs" option on Special:Log is now always the first
   item
 * (bug 16817) Group names in user rights log are now singular and in lowercase
+* Special:Preferences no longer crashes if the wiki default date formatting
+  style is not valid for the user's interface language
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent

diff --git a/includes/Preferences.php b/includes/Preferences.php
index eb5e1f9..fce0e26 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1105,6 +1105,11 @@ class Preferences {
                                $dateopts[] = 'default'; // Make sure default is always valid
                                                                                // Bug 19237
                        }
+                       // KLUGE: site default might not be valid for user language
+                       global $wgDefaultUserOptions;
+                       if ( !in_array( $wgDefaultUserOptions['date'], $dateopts ) ) {
+                               $wgDefaultUserOptions['date'] = 'default';
+                       }
 
                        $idCnt = 0;
                        $epoch = wfTimestampNow();