Index: /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php
===================================================================
--- /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php	(revision 1034)
+++ /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php	(revision 1035)
@@ -1,5 +1,5 @@
 <?php
 
-class FCKeditor
+class FCKeditor_MediaWiki
 {
     private $count = array();
@@ -91,7 +91,7 @@
     public function onParserAfterTidy(&$parser, &$text)
     {
-        global $wgUseTeX, $wgUser, $wgTitle;
+        global $wgUseTeX, $wgUser, $wgTitle, $wgFCKEditorIsCompatible;
         
-        if (!$wgUser->getOption( 'showtoolbar' ) || $wgUser->getOption( 'riched_disable' )) {
+        if (!$wgUser->getOption( 'showtoolbar' ) || $wgUser->getOption( 'riched_disable' ) || !$wgFCKEditorIsCompatible) {
             return true;
         }
@@ -140,9 +140,9 @@
     public function onEditPageShowEditFormInitial( $form ) {
         global $wgOut, $wgTitle, $wgScriptPath;
-        global $wgFCKEditorToolbarSet;
+        global $wgFCKEditorToolbarSet, $wgFCKEditorIsCompatible;
         global $wgFCKEditorExtDir, $wgFCKEditorDir, $wgFCKEditorHeight, $wgUser;
         global $wgStylePath, $wgStyleVersion, $wgDefaultSkin, $wgExtensionFunctions;
 
-        if (!$wgUser->getOption( 'showtoolbar' ) || $wgUser->getOption( 'riched_disable' )) {
+        if (!$wgUser->getOption( 'showtoolbar' ) || $wgUser->getOption( 'riched_disable' ) || !$wgFCKEditorIsCompatible) {
             return true;
         }
Index: /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.php
===================================================================
--- /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.php	(revision 1034)
+++ /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.php	(revision 1035)
@@ -34,4 +34,5 @@
 require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . "FCKeditorSkin.body.php";
 require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . "FCKeditor.body.php";
+require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . "fckeditor" . DIRECTORY_SEPARATOR . "fckeditor.php";
 
 $wgFCKEditorExtDir       = "extensions/FCKeditor";
@@ -58,5 +59,8 @@
 );
 
-$oFCKeditorExtension = new FCKeditor();
+$fckeditor = new FCKeditor("fake");
+$wgFCKEditorIsCompatible = $fckeditor->IsCompatible();
+
+$oFCKeditorExtension = new FCKeditor_MediaWiki();
 $oFCKeditorExtension->registerHooks();