Changeset 1929 for MediaWiki/trunk/FCKeditorEditPage.body.php

Timestamp:

2008-04-16 09:25:55 (5 months ago)

Author:

wwalc

Message:

Fix for #1385 and #1174 - HTML/WikiText mess on conflict/preview

Files:

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

MediaWiki/trunk/FCKeditorEditPage.body.php

@@ -29 +29 @@
                 }
         }
-        
+
         function getPreviewText() {
                 if (!$this->isCssJsSubpage) {
@@ -41 +41 @@
                 return $result;
         }
+
+        function getContent( $def_text = '' ) {
+                $t = parent::getContent( $def_text );
+                if(!$this->isConflict) {
+                        return $t;
+                }
+                $options = new FCKeditorParserOptions();
+                $options->setTidy(true);
+                $parser = new FCKeditorParser();
+                $parser->setOutputType(OT_HTML);
+                $pa = $parser->parse($t, $this->mTitle, $options);
+                return $pa->mText;
+
+        }
+
+        function getWikiContent(){
+                return $this->mArticle->getContent();
+        }
+
+        /**
+         * This is a hack to fix
+         * http://dev.fckeditor.net/ticket/1174
+         * If RTE is enabled, diff must be performed on WikiText, not on HTML
+         */
+        function showDiff() {
+                global $wgFCKWikiTextBeforeParse;
+                if (isset($wgFCKWikiTextBeforeParse)) {
+                        $_textbox1 = $this->textbox1;
+                        $this->textbox1 = $wgFCKWikiTextBeforeParse;
+                }
+                        $result = parent::showDiff();
+                if (isset($wgFCKWikiTextBeforeParse)) {
+                        $this->textbox1 = $_textbox1;
+                }
+        }
 }