Index: /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php
===================================================================
--- /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php	(revision 532)
+++ /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php	(revision 533)
@@ -446,5 +446,8 @@
     	return $text;
     }
-    
+    function stripNoGallery($text) {}
+    function stripToc( $text ) {
+    	return '<span class="fck_magic">' . $text . '</span>';
+    }
     function strip( $text, $state, $stripcomments = false , $dontstrip = array () ) {
         $dontstrip[] = "gallery";
Index: /MediaWiki/trunk/includes/SpecialPreferences.php
===================================================================
--- /MediaWiki/trunk/includes/SpecialPreferences.php	(revision 532)
+++ /MediaWiki/trunk/includes/SpecialPreferences.php	(revision 533)
@@ -866,5 +866,5 @@
 		# FCKeditor
 		#
-		if ($wgUser->getOption( 'fck_edit_enabled' )) {
+		if (!$wgUser->getOption( 'riched_disable' )) {
 		  $wgOut->addHTML( '<fieldset><legend>' . wfMsg( 'textrichditor' ) . '</legend>' .			 			
 			 $this->getToggles( FCKeditor::$nsToggles ) . '</fieldset>'