r87957 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r87956‎ | r87957 | r87958 >
Date:09:36, 13 May 2011
Author:mah
Status:deferred
Tags:
Comment:
* Fix up bone-headed mistake from r82149
* Random eol w/s cleanup.
Modified paths:
  • /trunk/extensions/FCKeditor/FCKeditor.body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/FCKeditor/FCKeditor.body.php
@@ -233,8 +233,8 @@
234234 */
235235 public static function onGetPreferences( $user, &$preferences ){
236236 global $wgDefaultUserOptions;
237 -
238237
 238+
239239 $preferences['riched_disable'] = array(
240240 'type' => 'toggle',
241241 'section' => 'editing/fckeditor',
@@ -374,7 +374,7 @@
375375 $showSource = true;
376376 }
377377
378 -
 378+
379379 $script .= '
380380 <script type="text/javascript">
381381 var showFCKEditor = ' . $this->showFCKEditor . ';
@@ -396,7 +396,7 @@
397397 oFCKeditor.Config["CustomConfigurationsPath"] = wgScriptPath + "/" + wgFCKEditorExtDir + "/fckeditor_config.js";';
398398 // Load fckeditor-rtl.css for right-to-left languages, but only fckeditor.css for other languages
399399 if( $wgContLang->isRTL() ) {
400 - $script .= 'oFCKeditor.Config["EditorAreaCSS"] = wgScriptPath + "/" + wgFCKEditorExtDir + "/css/fckeditor.css + wgScriptPath + "/" + wgFCKEditorExtDir + "/css/fckeditor-rtl.css";';
 400+ $script .= 'oFCKeditor.Config["EditorAreaCSS"] = wgScriptPath + "/" + wgFCKEditorExtDir + "/css/fckeditor.css," + wgScriptPath + "/" + wgFCKEditorExtDir + "/css/fckeditor-rtl.css";';
401401 } else {
402402 $script .= 'oFCKeditor.Config["EditorAreaCSS"] = wgScriptPath + "/" + wgFCKEditorExtDir + "/css/fckeditor.css";';
403403 }

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r82149Today's batch of fixes:...diederik22:40, 14 February 2011

Status & tagging log