Changeset 1941 for MediaWiki

Timestamp:

2008-04-22 14:03:31 (6 months ago)

Author:

wwalc

Message:

Fix for #2069: templates removed from tags attributes

Location:

MediaWiki/trunk

Files:

• FCKeditor.body.php (modified) (2 diffs)
• FCKeditorParser.body.php (modified) (1 diff)
• mw12/FCKeditorParser_OldPP.body.php (modified) (1 diff)
• plugins/mediawiki/fckplugin.js (modified) (1 diff)

MediaWiki/trunk/FCKeditor.body.php

@@ -124 +124 @@
                 return true;
         }
+        
+        public function onSanitizerAfterFixTagAttributes($text, $element, &$attribs)
+        {
+                $text = preg_match_all("/Fckmw\d+fckmw/", $text, $matches);
+                
+                if (!empty($matches[0][0])) {
+                        global $leaveRawTemplates;
+                        if (!isset($leaveRawTemplates)) {
+                                $leaveRawTemplates = array();
+                        }
+                        $leaveRawTemplates = array_merge($leaveRawTemplates, $matches[0]);
+                        $attribs = array_merge($attribs, $matches[0]);
+                }
+
+                return true;
+        }
 
         public function registerHooks() {
@@ -139 +155 @@
                 $wgHooks['ParserBeforeInternalParse'][]         = array($this, "onParserBeforeInternalParse");
                 $wgHooks['EditPageBeforeConflictDiff'][]                = array($this, 'onEditPageBeforeConflictDiff');
+                $wgHooks['SanitizerAfterFixTagAttributes'][]    = array($this, 'onSanitizerAfterFixTagAttributes');
 
                 if ($this->debug) {

MediaWiki/trunk/FCKeditorParser.body.php

@@ -464 +464 @@
 
                 if (!empty($this->fck_mw_strtr_span)) {
+                        global $leaveRawTemplates;
+                        if (!empty($leaveRawTemplates)) {
+                                foreach ($leaveRawTemplates as $l) {
+                                        $this->fck_mw_strtr_span[$l] = substr($this->fck_mw_strtr_span[$l], 30, -7);
+                                }
+                        }
                         $parserOutput->setText(strtr($parserOutput->getText(), $this->fck_mw_strtr_span));
                 }

MediaWiki/trunk/mw12/FCKeditorParser_OldPP.body.php

@@ -464 +464 @@
 
                 if (!empty($this->fck_mw_strtr_span)) {
+                        global $leaveRawTemplates;
+                        if (!empty($leaveRawTemplates)) {
+                                foreach ($leaveRawTemplates as $l) {
+                                        $this->fck_mw_strtr_span[$l] = substr($this->fck_mw_strtr_span[$l], 30, -7);
+                                }
+                        }
                         $parserOutput->setText(strtr($parserOutput->getText(), $this->fck_mw_strtr_span));
                 }

MediaWiki/trunk/plugins/mediawiki/fckplugin.js

@@ -676 +676 @@
                                         sAttValue = htmlNode.getAttribute( sAttName, 2 ) ;      // We must use getAttribute to get it exactly as it is defined.
 
-                                attStr += ' ' + sAttName + '="' + String(sAttValue).replace( '"', '"' ) + '"' ;
+                                // leave templates
+                                if ( sAttName.StartsWith( '{{' ) && sAttName.EndsWith( '}}' ) ) {
+                                        attStr += ' ' + sAttName ;
+                                }
+                                else {
+                                        attStr += ' ' + sAttName + '="' + String(sAttValue).replace( '"', '"' ) + '"' ;
+                                }
                         }
                 }