Changeset 544

Timestamp:

2007-07-26 01:09:11 (18 months ago)

Author:

wwalc

Message:

added hack in EditPage.php to handle preview properly plus one minor change in FCKeditor.body.php

Location:

MediaWiki/trunk

Files:

• extensions/FCKeditor/FCKeditor.body.php (modified) (1 diff)
• includes/EditPage.php (modified) (2 diffs)
• skins/monobook/main.css (modified) (2 diffs)

MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php

@@ -257 +257 @@
         global $wgFCKEditorExtDir, $wgFCKEditorDir, $wgFCKEditorHeight, $wgUser;
         global $wgStylePath, $wgStyleVersion;
-        
-        print "ONEDIT!!!!!";
         
         $options = new FCKeditorParserOptions();

MediaWiki/trunk/includes/EditPage.php

@@ -1358 +1358 @@
          */
         function getPreviewText() {
-                global $wgOut, $wgUser, $wgTitle, $wgParser;
+                global $wgOut, $wgUser, $wgTitle, $wgParser, $wgRequest;
 
                 $fname = 'EditPage::getPreviewText';
                 wfProfileIn( $fname );
 
+        if ($wgUser->getOption( 'showtoolbar' ) && !$wgUser->getOption( 'riched_disable' )) {
+                    $oldTextBox1 = $this->textbox1;
+                    $this->importFormData( $wgRequest );
+        }
+        
                 if ( $this->mTriedSave && !$this->mTokenOk ) {
                         $msg = 'session_fail_preview';
@@ -1421 +1426 @@
 
                         wfProfileOut( $fname );
+            if ($wgUser->getOption( 'showtoolbar' ) && !$wgUser->getOption( 'riched_disable' )) {
+                       $this->textbox1 = $oldTextBox1;
+            }
                         return $previewhead . $previewHTML;
-                }
+                }               
         }
 

MediaWiki/trunk/skins/monobook/main.css

@@ -54 +54 @@
         font: x-small sans-serif;
         background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat;
-        color: black;
+        color: green;
         margin: 0;
         padding: 0;
@@ -126 +126 @@
 
 h1, h2, h3, h4, h5, h6 {
-        color: black;
+        color: red;
         background: none;
         font-weight: normal;