Ticket #2223: 2223_4.patch

FCKeditorParser.body.php

@@ -309 +309 @@
                 $text = preg_replace("/\[\[([^|\[\]]*?)\]\]/", "[[RTENOTITLE$1|$1]]", $text);   //#2223: [[()]] =>      [[RTENOTITLE%1|%1]]
                 $text = preg_replace("/\[\[:(.*?)\]\]/", "[[RTECOLON$1]]", $text);      //change ':' => 'RTECOLON' in links
                 $text = parent::replaceInternalLinks($text);
+                for($i=0; $i<count($this->mLinkHolders['dbkeys']);$i++)
+                        if (substr($this->mLinkHolders['dbkeys'][$i], 0, 10) == "RTENOTITLE")
+                        {
+                                $this->mLinkHolders['dbkeys'][$i] = "RTENOTITLE". $this->mLinkHolders['texts'][$i];
+                                $this->mLinkHolders['titles'][$i]->mPrefixedText = $this->mLinkHolders['dbkeys'][$i];
+                                $this->mLinkHolders['titles'][$i]->mFragment = '';
+                }
+
                 $text = preg_replace("/<strong class=\"selflink\">(.*?)<\/strong>/", "<a href=\"".$this->mTitle->mDbkeyform."\" class=\"selflink\">$1</a>", $text);                             // #2075
                 $text = preg_replace("/\[\[RTENOTITLE(.*?)\|/", "[[", $text);                           // remove unused RTENOTITLE
 

mw12/FCKeditorParser_OldPP.body.php

@@ -310 +310 @@
                 $text = preg_replace("/\[\[([^|\[\]]*?)\]\]/", "[[RTENOTITLE$1|$1]]", $text);   //#2223: [[()]] =>      [[RTENOTITLE%1|%1]]
                 $text = preg_replace("/\[\[:(.*?)\]\]/", "[[RTECOLON$1]]", $text);      //change ':' => 'RTECOLON' in links
                 $text = parent::replaceInternalLinks($text);
+                for($i=0; $i<count($this->mLinkHolders['dbkeys']);$i++)
+                        if (substr($this->mLinkHolders['dbkeys'][$i], 0, 10) == "RTENOTITLE")
+                        {
+                                $this->mLinkHolders['dbkeys'][$i] = "RTENOTITLE". $this->mLinkHolders['texts'][$i];
+                                $this->mLinkHolders['titles'][$i]->mPrefixedText = $this->mLinkHolders['dbkeys'][$i];
+                                $this->mLinkHolders['titles'][$i]->mFragment = '';
+                }
+
                 $text = preg_replace("/<strong class=\"selflink\">(.*?)<\/strong>/", "<a href=\"".$this->mTitle->mDbkeyform."\" class=\"selflink\">$1</a>", $text);                             // #2075
                 $text = preg_replace("/\[\[RTENOTITLE(.*?)\|/", "[[", $text);                           // remove unused RTENOTITLE
 

plugins/mediawiki/fckplugin.js

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