* (bug 22876) Avoid possible PHP Notice if $wgDefaultUserOptions is not correctly set

Per Nikerabbit, use User::getDefaultOption()

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1f41136..04c9f5c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -60,6 +60,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 22940) Namespace aliases pointing to main namespace don't work
 * (bug 15810) blocked admins can no longer block/unblock other users, nor
   themselves unless they are given the 'unblockself' permission.
+* (bug 22876) Avoid possible PHP Notice if $wgDefaultUserOptions is not
+  correctly set
 
 == API changes in 1.17 ==
 * (bug 22738) Allow filtering by action type on query=logevent

diff --git a/languages/Language.php b/languages/Language.php
index ef50f73..aa1a65c 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1367,8 +1367,7 @@ class Language {
                        if( $usePrefs ) {
                                $datePreference = $wgUser->getDatePreference();
                        } else {
-                               $options = User::getDefaultOptions();
-                               $datePreference = (string)$options['date'];
+                               $datePreference = (string)User::getDefaultOption( 'date' );
                        }
                } else {
                        $datePreference = (string)$usePrefs;