Ticket #2191: 2191.patch

FCKeditor.body.php

@@ -59 +59 @@
         }
 
         private function getExcludedNamespaces() {
-                global $wgUser;
+                global $wgUser,$wgDefaultUserOptions;
 
                 if ( is_null( $this->excludedNamespaces ) ) {
                         $this->excludedNamespaces = array();
                         foreach ( self::$nsToggles as $toggle ) {
-                                if ( $wgUser->getOption( $toggle ) ) {
+                                $default = isset($wgDefaultUserOptions[$toggle]) ? $wgDefaultUserOptions[$toggle] : "";
+                                if ( $wgUser->getOption( $toggle, $default) ) {
                                         $this->excludedNamespaces[] = constant(strtoupper(str_replace("riched_disable_", "", $toggle)));
                                 }
                         }
@@ -283 +284 @@
                 global $wgFCKEditorExtDir, $wgFCKEditorDir, $wgFCKEditorHeight, $wgUser;
                 global $wgStylePath, $wgStyleVersion, $wgDefaultSkin, $wgExtensionFunctions;
                 global $wgFCKWikiTextBeforeParse;
-                global $wgHooks;
+                global $wgHooks, $wgDefaultUserOptions;
 
                 if (!isset($this->showFCKEditor))
                 {
                         $this->showFCKEditor = 0;
-                        if ( !$wgUser->getOption( 'riched_start_disabled' ) ) {
+                        if ( !$wgUser->getOption( 'riched_start_disabled',$wgDefaultUserOptions['riched_start_disabled'] ) ) {
                                 $this->showFCKEditor += RTE_VISIBLE;
                         }
-                        if ( $wgUser->getOption( 'riched_use_popup' ) ) {
+                        if ( $wgUser->getOption( 'riched_use_popup',$wgDefaultUserOptions['riched_use_popup'] ) ) {
                                 $this->showFCKEditor += RTE_POPUP;
                         }
-                        if ( $wgUser->getOption( 'riched_use_toggle' ) ) {
+                        if ( $wgUser->getOption( 'riched_use_toggle',$wgDefaultUserOptions['riched_use_toggle'] ) ) {
                                 $this->showFCKEditor += RTE_TOGGLE_LINK;
                         }
                 }
 
-                if( (!empty($_SESSION['showMyFCKeditor'])) && ($wgUser->getOption( 'riched_toggle_remember_state' )))
+                if( (!empty($_SESSION['showMyFCKeditor'])) && ($wgUser->getOption( 'riched_toggle_remember_state',$wgDefaultUserOptions['riched_toggle_remember_state'] )))
                 {
                         //clear RTE_VISIBLE flag
                         $this->showFCKEditor &= ~RTE_VISIBLE ;
@@ -307 +308 @@
                         $this->showFCKEditor |= $_SESSION['showMyFCKeditor'] ;                  
                 }
         
-                if (!$wgUser->getOption( 'showtoolbar' ) || $wgUser->getOption( 'riched_disable' ) || !$wgFCKEditorIsCompatible) {
+                if (!$wgUser->getOption( 'showtoolbar' ) || $wgUser->getOption( 'riched_disable',$wgDefaultUserOptions['riched_disable']  ) || !$wgFCKEditorIsCompatible) {
                         return true;
                 }
 
@@ -377 +378 @@
 var editorMsgOn = "'. wfMsg( 'textrichditor' ) .'";
 var editorMsgOff = "'. wfMsg( 'tog-riched_disable' ) .'";
 var editorLink = "'. (($this->showFCKEditor & RTE_VISIBLE)? wfMsg( 'tog-riched_disable' ): wfMsg( 'textrichditor' )) .'";               
-var saveSetting = '. ($wgUser->getOption( 'riched_toggle_remember_state' ) ?  1 : 0) .';
+var saveSetting = '. ($wgUser->getOption( 'riched_toggle_remember_state',$wgDefaultUserOptions['riched_toggle_remember_state']  ) ?  1 : 0) .';
 var RTE_VISIBLE = '.RTE_VISIBLE.';
 var RTE_TOGGLE_LINK = '.RTE_TOGGLE_LINK.';
 var RTE_POPUP = '.RTE_POPUP.';
@@ -739 +740 @@
         }
 
         public function onUserToggles( &$extraToggles ) {
+                global $wgUser,$wgDefaultUserOptions;
                 $extraToggles[] = 'riched_disable';
                 $extraToggles[] = 'riched_start_disabled';
                 $extraToggles[] = 'riched_use_popup';
                 $extraToggles[] = 'riched_use_toggle';
                 $extraToggles[] = 'riched_toggle_remember_state';
                 
+                //Show default options in Special:Preferences
+                if( !array_key_exists( "riched_disable", $wgUser->mOptions )) 
+                        $wgUser->setOption("riched_disable",$wgDefaultUserOptions['riched_disable']);
+                if( !array_key_exists( "riched_start_disabled",         $wgUser->mOptions )) 
+                        $wgUser->setOption("riched_start_disabled",$wgDefaultUserOptions['riched_start_disabled']);
+                if( !array_key_exists( "riched_use_popup",      $wgUser->mOptions )) 
+                        $wgUser->setOption("riched_use_popup",$wgDefaultUserOptions['riched_use_popup']);
+                if( !array_key_exists( "riched_use_toggle",     $wgUser->mOptions )) 
+                        $wgUser->setOption("riched_use_toggle",$wgDefaultUserOptions['riched_use_toggle']);
+                if( !array_key_exists( "riched_toggle_remember_state",  $wgUser->mOptions )) 
+                        $wgUser->setOption("riched_toggle_remember_state",$wgDefaultUserOptions['riched_toggle_remember_state']);
+
                 $extraToggles = array_merge($extraToggles, self::$nsToggles);
                 return true;
         }