Index: /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php
===================================================================
--- /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php	(revision 592)
+++ /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php	(revision 593)
@@ -64,7 +64,7 @@
         global $wgHooks;
 
-        $wgHooks['UserToggles'][]                       = $this;
-        $wgHooks['MessagesPreLoad'][]                   = $this;
-        $wgHooks['ParserAfterTidy'][]                   = $this;
+        $wgHooks['UserToggles'][]                       = array($this, 'onUserToggles');
+        $wgHooks['MessagesPreLoad'][]                   = array($this, 'onMessagesPreLoad');
+        $wgHooks['ParserAfterTidy'][]                   = array($this, 'onParserAfterTidy');
         $wgHooks['EditPage::showEditForm:initial'][]    = array($this, 'onEditPageShowEditFormInitial');
 
Index: /MediaWiki/trunk/includes/EditPage.php
===================================================================
--- /MediaWiki/trunk/includes/EditPage.php	(revision 592)
+++ /MediaWiki/trunk/includes/EditPage.php	(revision 593)
@@ -1425,8 +1425,8 @@
 					$this->mPreviewTemplates[] = Title::makeTitle($ns, $dbk);
 
-			wfProfileOut( $fname );
             if ($wgUser->getOption( 'showtoolbar' ) && !$wgUser->getOption( 'riched_disable' )) {
 	   	       $this->textbox1 = $oldTextBox1;
             }
+			wfProfileOut( $fname );
 			return $previewhead . $previewHTML;
 		}