Changeset 1756 for MediaWiki/trunk/FCKeditor.php

Timestamp:

2008-03-20 23:58:35 (6 months ago)

Author:

wwalc

Message:

+MW 12 compatibility, fixed E_STRICT warnings

Files:

• MediaWiki/trunk/FCKeditor.php (modified) (2 diffs)

MediaWiki/trunk/FCKeditor.php

@@ -28 +28 @@
 require_once $IP . "/includes/GlobalFunctions.php";
 require_once $IP . "/includes/ParserOptions.php";
-require_once $IP . "/includes/Parser.php";
 require_once $IP . "/includes/EditPage.php";
+
+if (version_compare("1.12", $wgVersion, "<")) {
+    require_once $IP . "/includes/Parser_OldPP.php";
+    require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . "mw12/FCKeditorParser_OldPP.body.php";
+}
+else {
+    require_once $IP . "/includes/Parser.php";
+    require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . "FCKeditorParser.body.php";
+}
+
 require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . "FCKeditorSajax.body.php";
-require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . "FCKeditorParser.body.php";
 require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . "FCKeditorParserOptions.body.php";
 require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . "FCKeditorSkin.body.php";
@@ -38 +46 @@
 require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . "fckeditor" . DIRECTORY_SEPARATOR . "fckeditor.php";
 
-$wgFCKEditorExtDir       = "extensions/FCKeditor";
-$wgFCKEditorDir          = "extensions/FCKeditor/fckeditor";
-$wgFCKEditorToolbarSet   = "Wiki";
-$wgFCKEditorHeight       = "0";         // "0" for automatic ("300" minimum).
+if (empty ($wgFCKEditorExtDir)) {
+    $wgFCKEditorExtDir = "extensions/FCKeditor" ;
+}
+if (empty ($wgFCKEditorDir)) {
+    $wgFCKEditorDir = "extensions/FCKeditor/fckeditor" ;
+}
+if (empty ($wgFCKEditorToolbarSet)) {
+    $wgFCKEditorToolbarSet = "Wiki" ;
+}
+if (empty ($wgFCKEditorHeight)) {
+    $wgFCKEditorHeight = "0" ; // "0" for automatic ("300" minimum).
+}
 
 /**