When reading an old-style user_options blob, use the default value for any preference...

diff --git a/includes/User.php b/includes/User.php
index 6430ace..a3f6cdd 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -2411,7 +2411,9 @@ class User {
                $this->mOptionsLoaded = true;
                $this->mOptionOverrides = array();
 
-               $this->mOptions = array();
+               // If an option is not set in $str, use the default value
+               $this->mOptions = self::getDefaultOptions();
+               
                $a = explode( "\n", $str );
                foreach ( $a as $s ) {
                        $m = array();