Changeset 1840 for MediaWiki/trunk/FCKeditor.body.php

Timestamp:

2008-03-29 00:07:14 (5 months ago)

Author:

wwalc

Message:

Fix for #1577 (Fatal error using some skins)

Files:

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

MediaWiki/trunk/FCKeditor.body.php

@@ -214 +214 @@
                 $skin->loggedin = $wgUser->isLoggedIn();
                 $skin->mTitle =& $wgTitle;
-                $skin->skinname = 'monobook';
+                //$skin->skinname = 'monobook';
                 $skin->userpage = $wgUser->getUserPage()->getPrefixedText();
-                $skin->setupUserCss();
-
-                preg_match_all('/@import "([^"]+)";/', $skin->usercss, $matches);
-                $userStyles = $matches[1];
+                if (method_exists($skin, "setupUserCss")) {
+                        $skin->setupUserCss();
+                }
+
+                if (!empty($skin->usercss) && preg_match_all('/@import "([^"]+)";/', $skin->usercss, $matches)) {
+                        $userStyles = $matches[1];
+                }
                 //End of CSS trick
 
@@ -234 +237 @@
 HEREDOC;
 
-                if (!is_null($userStyles) && !empty($userStyles)) {
+                if (!empty($userStyles)) {
                         $script .= '
 <script type="text/javascript">