Index: /MediaWiki/trunk/FCKeditor.body.php
===================================================================
--- /MediaWiki/trunk/FCKeditor.body.php	(revision 3238)
+++ /MediaWiki/trunk/FCKeditor.body.php	(revision 3239)
@@ -60,5 +60,5 @@
 
 	private function getExcludedNamespaces() {
-		global $wgUser,$wgDefaultUserOptions;
+		global $wgUser,$wgDefaultUserOptions, $wgFCKEditorExcludedNamespaces;
 
 		if ( is_null( $this->excludedNamespaces ) ) {
@@ -69,4 +69,11 @@
 					$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.
+			*/
+			if (!empty($wgFCKEditorExcludedNamespaces) && is_array($wgFCKEditorExcludedNamespaces)) {
+				$this->excludedNamespaces = array_merge($wgFCKEditorExcludedNamespaces, $this->excludedNamespaces);
 			}
 		}