Index: FCKeditor.body.php
===================================================================
--- FCKeditor.body.php	(revision 5861)
+++ FCKeditor.body.php	(working copy)
@@ -203,7 +203,7 @@
 		}
 	}
 
-	public function onCustomEditor(&$article, &$user) {
+	public function onCustomEditor( $article, $user ) {
 		global $wgRequest, $mediaWiki;
 
 		$action = $mediaWiki->getVal('Action');
Index: FCKeditorParser.body.php
===================================================================
--- FCKeditorParser.body.php	(revision 5861)
+++ FCKeditorParser.body.php	(working copy)
@@ -335,7 +335,7 @@
 		return $text;
 	}
 
-	function makeImage( $nt, $options ) {
+	function makeImage( $nt, $options, $holders=false ) {
 		FCKeditorParser::$fkc_mw_makeImage_options = $options;
 		return parent::makeImage( $nt, $options );
 	}
@@ -432,7 +432,7 @@
 		return $text;
 	}
 
-	function internalParse ( $text ) {
+	function internalParse ( $text, $isMain = true, $frame=false ) {
 
 		$this->fck_internal_parse_text =& $text;
 
@@ -462,7 +462,7 @@
 	function fck_leaveTemplatesAlone( $matches ) {
 		return "<!--FCK_SKIP_START-->".$matches['text']."<!--FCK_SKIP_END-->";
 	}
-	function formatHeadings( $text, $isMain=true ) {
+	function formatHeadings( $text, $origText, $isMain=true ) {
 		return $text;
 	}
 	function replaceFreeExternalLinks( $text ) { return $text; }
@@ -485,7 +485,7 @@
 		return $text;
 	}
 
-	function parse( $text, &$title, $options, $linestart = true, $clearState = true, $revid = null ) {
+	function parse( $text, Title $title, ParserOptions $options, $linestart = true, $clearState = true, $revid = null ) {
 		$text = preg_replace("/^#REDIRECT/", "<!--FCK_REDIRECT-->", $text);
 		$parserOutput = parent::parse($text, $title, $options, $linestart , $clearState , $revid );
 
Index: FCKeditorSkin.body.php
===================================================================
--- FCKeditorSkin.body.php	(revision 5861)
+++ FCKeditorSkin.body.php	(working copy)
@@ -440,7 +440,7 @@
 		return call_user_func_array( array( $this->skin, $m ), $a );
 	}
 
-	function __construct( &$skin ) {
+	function __construct( $skin ) {
 		$this->skin = $skin;
 	}
 }
Index: mw12/FCKeditorParserWrapper.body.php
===================================================================
--- mw12/FCKeditorParserWrapper.body.php	(revision 5861)
+++ mw12/FCKeditorParserWrapper.body.php	(working copy)
@@ -26,7 +26,7 @@
 		return parent::makeImage( $title, $options, $holders );
 	}
 
-	function internalParse( $text ) {
+	function internalParse( $text, $isMain = true, $frame=false ) {
 		return parent::internalParse( $text );
 	}