Ticket #2543: 2543.patch

FCKeditor.body.php

@@ -59 +59 @@
         }
 
         private function getExcludedNamespaces() {
-                global $wgUser;
+                global $wgUser, $wgFCKexcludedNamespaces;
 
                 if ( is_null( $this->excludedNamespaces ) ) {
                         $this->excludedNamespaces = array();
@@ -68 +68 @@
                                         $this->excludedNamespaces[] = constant(strtoupper(str_replace("riched_disable_", "", $toggle)));
                                 }
                         }
+                /*
+                If this site's LocalSettings.php defines Namespaces that shouldn't use the FCKEditor (in the #wgFCKexcludedNamespaces array), those excluded
+                namespaces should be combined with those excluded in the user's preferences.
+                */
+                $this->excludedNamespaces = array_merge((array)$wgFCKexcludedNamespaces, $this->excludedNamespaces);
                 }
 
                 return $this->excludedNamespaces;