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

Timestamp:

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

Author:

wwalc

Message:

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

Files:

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

MediaWiki/trunk/FCKeditor.body.php

@@ -75 +75 @@
                 return true;
         }
+        
+        public function onEditPageShowEditFormFields($pageEditor, $wgOut)
+        {
+                global $wgUser, $wgFCKEditorIsCompatible, $wgTitle, $wgVersion;
+
+                /*
+                If FCKeditor extension is enabled, BUT it shouldn't appear (because it's disabled by user, we have incompatible browser etc.)
+                We must do this trick to show the original text as WikiText instead of HTML when conflict occurs
+                */
+                if ( (!$wgUser->getOption( 'showtoolbar' ) || $wgUser->getOption( 'riched_disable' ) || !$wgFCKEditorIsCompatible) ||
+                                in_array($wgTitle->getNamespace(), $this->getExcludedNamespaces()) ||
+                                false !== strpos($pageEditor->textbox1, "__NORICHEDITOR__")
+                        ) {
+                        if ($pageEditor->isConflict) {
+                                $pageEditor->textbox1 = $pageEditor->getWikiContent();
+                        }
+                }
+                /*
+                If FCKeditor extension is enabled, and it should appear
+                We must do this trick to show HTML instead of the original text when conflict occurs
+                This hack is only needed for MW 1.11 and below
+                */
+                else if (version_compare("1.12", $wgVersion, ">")) {
+                        if ($pageEditor->isConflict) {
+                        $options = new FCKeditorParserOptions();
+                        $options->setTidy(true);
+                        $parser = new FCKeditorParser();
+                        $parser->setOutputType(OT_HTML);
+                        $pa = $parser->parse($pageEditor->textbox1, $pageEditor->mTitle, $options);
+                        $pageEditor->textbox1 = $pa->mText;
+                        }
+                }
+                
+                return true;
+        }
+
+        public function onEditPageBeforeConflictDiff($pageEditor, $wgOut)
+        {
+                global $fckPageEditor, $wgRequest;
+
+                /*
+                Show WikiText instead of HTML when there is a conflict
+                http://dev.fckeditor.net/ticket/1385
+                */
+                $pageEditor->textbox2 = $wgRequest->getVal( 'wpTextbox1' );
+                $pageEditor->textbox1 = $pageEditor->getWikiContent();
+                                
+                return true;
+        }
 
         public function registerHooks() {
@@ -83 +132 @@
                 $wgHooks['ParserAfterTidy'][]                   = array($this, 'onParserAfterTidy');
                 $wgHooks['EditPage::showEditForm:initial'][]    = array($this, 'onEditPageShowEditFormInitial');
+                $wgHooks['EditPage::showEditForm:fields'][]             = array($this, 'onEditPageShowEditFormFields');
                 $wgHooks['EditPageBeforePreviewText'][]         = array($this, 'onEditPageBeforePreviewText');
                 $wgHooks['EditPagePreviewTextEnd'][]            = array($this, 'onEditPagePreviewTextEnd');
@@ -88 +138 @@
                 $wgHooks['LanguageGetMagic'][]                  = array($this, "onLanguageGetMagic");
                 $wgHooks['ParserBeforeInternalParse'][]         = array($this, "onParserBeforeInternalParse");
+                $wgHooks['EditPageBeforeConflictDiff'][]                = array($this, 'onEditPageBeforeConflictDiff');
 
                 if ($this->debug) {
+                        /*
+                        This is just an array of all available hooks, useful for debugging and learning
+                        Add here all new hooks
+                        */
                         $opcje =  array('ArticleSave',
                         'ArticleInsertComplete', 'ArticleSaveComplete', 'TitleMoveComplete', 'ArticleProtect', 'ArticleProtectComplete', 'ArticleDelete', 'ArticleDeleteComplete', 'AlternateEdit', 'ArticleFromTitle', 'ArticleAfterFetchContent',
@@ -209 +264 @@
                 global $wgFCKEditorExtDir, $wgFCKEditorDir, $wgFCKEditorHeight, $wgUser;
                 global $wgStylePath, $wgStyleVersion, $wgDefaultSkin, $wgExtensionFunctions;
+                global $wgFCKWikiTextBeforeParse;
 
                 if (!$wgUser->getOption( 'showtoolbar' ) || $wgUser->getOption( 'riched_disable' ) || !$wgFCKEditorIsCompatible) {
@@ -226 +282 @@
                 $parser = new FCKeditorParser();
                 $parser->setOutputType(OT_HTML);
+                $wgFCKWikiTextBeforeParse = $form->textbox1;
                 $form->textbox1 = $parser->parse($form->textbox1, $wgTitle, $options)->getText();
 
@@ -315 +372 @@
 }
 addOnloadHook( onLoadFCKeditor ) ;
+</script>
+HEREDOC;
 
 /*
+$script .= <<<HEREDOC
+<script type="text/javascript">
 function showSource() {
         var wp = document.getElementById("wpDiff");
@@ -346 +407 @@
 
 addOnloadHook(showSource);
-*/
 </script>
 HEREDOC;
+*/
 
                 $wgOut->addScript($script);