Ticket #2509: 2509.patch

FCKeditorParser.body.php

@@ -486 +486 @@
                                         $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));
+                        $text = strtr($parserOutput->getText(), $this->fck_mw_strtr_span);
+                        $parserOutput->setText(strtr($text, $this->fck_mw_strtr_span));
                 }
 
                 if (!empty($this->fck_matches)) {

mw12/FCKeditorParser_OldPP.body.php

@@ -487 +487 @@
                                         $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));
+                        $text = strtr($parserOutput->getText(), $this->fck_mw_strtr_span);
+                        $parserOutput->setText(strtr($text, $this->fck_mw_strtr_span));
                 }
                 if (!empty($this->fck_matches)) {
                         $text = $parserOutput->getText() ;

plugins/mediawiki/dialogs/link.html

@@ -69 +69 @@
         if ( sHRef == null )
                 sHRef = oLink.getAttribute( 'href' , 2 ) || '' ;
                 
+        sHRef = FCKConfig.ProtectedSource.Revert(sHRef, 0);             //#2509
         if (sHRef.toLowerCase().StartsWith( 'rtenotitle' ) )
         {
                 sHRef = sHRef.substring(10);
@@ -186 +187 @@
 function Ok()
 {
         var sUri = GetE('txtUrl').value ;
+        sUri  = FCKConfig.ProtectedSource.Protect(sUri);                //#2509
         var realUri = sUri;
         if ( bLinkEqualsName ) {
                 sUri = 'RTENOTITLE'+ sUri;

plugins/mediawiki/dialogs/template.html

@@ -99 +99 @@
         if ( !oTemplateSpan ) return ;
 
         var inputText = FCKTools.HTMLDecode(oTemplateSpan.innerHTML);
+        inputText = FCKConfig.ProtectedSource.Revert(inputText, 0);             //#2509
         if (inputText.length>0 && inputText.indexOf('{{#')<0 && inputText.indexOf('{{:')<0 ) 
         {
                 var templateName = inputText.substring(2,inputText.indexOf('fckLR'));
@@ -128 +129 @@
                 oTemplateSpan.className = 'fck_mw_template' ;
         }
         
-        var templateData = FCKTools.HTMLEncode(GetE('xTemplateRaw').value.Trim().replace(/(\r\n|\n)/g, 'fckLR')).replace( /"/g, '&quot;' ) ;
+        var protectedValue = FCKConfig.ProtectedSource.Protect(GetE('xTemplateRaw').value);
+        var templateData = FCKTools.HTMLEncode(protectedValue.toString().Trim().replace(/(\r\n|\n)/g, 'fckLR')).replace( /"/g, '&quot;' ) ;
         
         if ( !( /^{{[\s\S]+}}$/.test( templateData ) ) )
         {

plugins/mediawiki/fckplugin.js

@@ -370 +370 @@
                                                         if (href.toLowerCase().StartsWith( 'rtenotitle' ))
                                                         {
                                                                 href = href.substring(10);
-                                                                if ( htmlNode.innerHTML == href ) pipeline = false;
+                                                                if ( FCKConfig.ProtectedSource.Revert(htmlNode.innerHTML, 0) == FCKConfig.ProtectedSource.Revert(href, 0) ) pipeline = false;
                                                         }
                                                         if (href.toLowerCase().StartsWith( 'rtecolon' ))                //change 'rtecolon=' => ':' in links
                                                         {