Index: trunk/phase3/languages/Language.php |
— | — | @@ -1367,8 +1367,7 @@ |
1368 | 1368 | if( $usePrefs ) { |
1369 | 1369 | $datePreference = $wgUser->getDatePreference(); |
1370 | 1370 | } else { |
1371 | | - $options = User::getDefaultOptions(); |
1372 | | - $datePreference = (string)$options['date']; |
| 1371 | + $datePreference = (string)User::getDefaultOption( 'date' ); |
1373 | 1372 | } |
1374 | 1373 | } else { |
1375 | 1374 | $datePreference = (string)$usePrefs; |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -60,6 +60,8 @@ |
61 | 61 | * (bug 22940) Namespace aliases pointing to main namespace don't work |
62 | 62 | * (bug 15810) blocked admins can no longer block/unblock other users, nor |
63 | 63 | themselves unless they are given the 'unblockself' permission. |
| 64 | +* (bug 22876) Avoid possible PHP Notice if $wgDefaultUserOptions is not |
| 65 | + correctly set |
64 | 66 | |
65 | 67 | == API changes in 1.17 == |
66 | 68 | * (bug 22738) Allow filtering by action type on query=logevent |