Ticket #5602: FCKeditor-php5.3.x-fix.patch

FCKeditor.body.php

@@ -203 +203 @@
                 }
         }
 
-        public function onCustomEditor(&$article, &$user) {
+        public function onCustomEditor( $article, $user ) {
                 global $wgRequest, $mediaWiki;
 
                 $action = $mediaWiki->getVal('Action');

FCKeditorParser.body.php

@@ -335 +335 @@
                 return $text;
         }
 
-        function makeImage( $nt, $options ) {
+        function makeImage( $nt, $options, $holders=false ) {
                 FCKeditorParser::$fkc_mw_makeImage_options = $options;
                 return parent::makeImage( $nt, $options );
         }
@@ -432 +432 @@
                 return $text;
         }
 
-        function internalParse ( $text ) {
+        function internalParse ( $text, $isMain = true, $frame=false ) {
 
                 $this->fck_internal_parse_text =& $text;
 
@@ -462 +462 @@
         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 +485 @@
                 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 );
 

FCKeditorSkin.body.php

@@ -440 +440 @@
                 return call_user_func_array( array( $this->skin, $m ), $a );
         }
 
-        function __construct( &$skin ) {
+        function __construct( $skin ) {
                 $this->skin = $skin;
         }
 }

mw12/FCKeditorParserWrapper.body.php

@@ -26 +26 @@
                 return parent::makeImage( $title, $options, $holders );
         }
 
-        function internalParse( $text ) {
+        function internalParse( $text, $isMain = true, $frame=false ) {
                 return parent::internalParse( $text );
         }