r87285 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r87284‎ | r87285 | r87286 >
Date:19:35, 2 May 2011
Author:ialex
Status:deferred
Tags:
Comment:
Removed hack to get styles from Skin::$usercss, that variable is now always false
Modified paths:
  • /trunk/extensions/FCKeditor/FCKeditor.body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/FCKeditor/FCKeditor.body.php
@@ -349,19 +349,6 @@
350350
351351 $printsheet = htmlspecialchars( "$wgStylePath/common/wikiprintable.css?$wgStyleVersion" );
352352
353 - // CSS trick, we need to get user CSS stylesheets somehow... it must be done in a different way!
354 - $skin = $wgUser->getSkin();
355 - $skin->loggedin = $wgUser->isLoggedIn();
356 - //$skin->mTitle =& $wgTitle; // FIXME: Am I still needed?
357 - $skin->initPage( $wgOut );
358 - $skin->userpage = $wgUser->getUserPage()->getPrefixedText();
359 - $skin->setupUserCss( $wgOut );
360 -
361 - if( !empty( $skin->usercss ) && preg_match_all( '/@import "([^"]+)";/', $skin->usercss, $matches ) ) {
362 - $userStyles = $matches[1];
363 - }
364 - // End of CSS trick
365 -
366353 $script = <<<HEREDOC
367354 <script type="text/javascript" src="$wgScriptPath/$wgFCKEditorDir/fckeditor.js"></script>
368355 <script type="text/javascript">
@@ -374,11 +361,6 @@
375362 <!--[if lt IE 7]><script type="text/javascript">sEditorAreaCSS += ',/mediawiki/skins/monobook/IEFixes.css?{$wgStyleVersion}'; </script><![endif]-->
376363 HEREDOC;
377364
378 - $script .= '<script type="text/javascript"> ';
379 - if( !empty( $userStyles ) ) {
380 - $script .= 'sEditorAreaCSS += ",' . implode( ',', $userStyles ) . '";';
381 - }
382 -
383365 # Show references only if Cite extension has been installed
384366 $showRef = false;
385367 if( ( isset( $wgHooks['ParserFirstCallInit'] ) && in_array( 'wfCite', $wgHooks['ParserFirstCallInit'] ) ) ||
@@ -394,6 +376,7 @@
395377
396378
397379 $script .= '
 380+<script type="text/javascript">
398381 var showFCKEditor = ' . $this->showFCKEditor . ';
399382 var popup = false; // pointer to popup document
400383 var firstLoad = true;

Status & tagging log