Merge "Use User::getDefaultOption() instead of $wgDefaultUserOptions"

diff --combined includes/User.php
index 76e8420,3279a38..ca8ce8f
--- 1/includes/User.php
--- 2/includes/User.php
+++ b/includes/User.php
@@@ -119,7 -119,6 +119,7 @@@ class User 
                'delete',
                'deletedhistory',
                'deletedtext',
 +              'deletelogentry',
                'deleterevision',
                'edit',
                'editinterface',
@@@ -528,7 -527,7 +528,7 @@@
         * as 300.300.300.300 will return true because it looks like an IP
         * address, despite not being strictly valid.
         *
 -       * We match \d{1,3}\.\d{1,3}\.\d{1,3}\.xxx as an anonymous IP
 +       * We match "\d{1,3}\.\d{1,3}\.\d{1,3}\.xxx" as an anonymous IP
         * address because the usemod software would "cloak" anonymous IP
         * addresses like this, if we allowed accounts like this to be created
         * new users could get the old edits of these anonymous users.
@@@ -2289,9 -2288,11 +2289,11 @@@
                $this->loadOptions();
  
                // Explicitly NULL values should refer to defaults
-               global $wgDefaultUserOptions;
-               if( is_null( $val ) && isset( $wgDefaultUserOptions[$oname] ) ) {
-                       $val = $wgDefaultUserOptions[$oname];
+               if( is_null( $val ) ) {
+                       $defaultOption = self::getDefaultOption( $oname );
+                       if( !is_null( $defaultOption ) ) {
+                               $val = $defaultOption;
+                       }
                }
  
                $this->mOptions[$oname] = $val;