Ticket #2223: 2223_2.patch

FCKeditorParser.body.php

@@ -306 +306 @@
         }
 
         function replaceInternalLinks( $text ) {
+                $text = preg_replace("/\[\[([^|\[\]]*?)\]\]/", "[[RTENOTITLE$1|$1]]", $text);   //#2223: [[()]] =>      [[RTENOTITLE%1|%1]]
                 $text = preg_replace("/\[\[:(.*?)\]\]/", "[[RTECOLON$1]]", $text);      //change ':' => 'RTECOLON' in links
-                return parent::replaceInternalLinks($text);
+                $text = parent::replaceInternalLinks($text);
+                $text = preg_replace("/\[\[RTENOTITLE(.*?)\|/", "[[", $text);                           // remove unused RTENOTITLE
+
+                return $text;
         }
 
         function makeImage( $nt, $options ) {

mw12/FCKeditorParser_OldPP.body.php

@@ -307 +307 @@
         }
 
         function replaceInternalLinks( $text ) {
+                $text = preg_replace("/\[\[([^|\[\]]*?)\]\]/", "[[RTENOTITLE$1|$1]]", $text);   //#2223: [[()]] =>      [[RTENOTITLE%1|%1]]
                 $text = preg_replace("/\[\[:(.*?)\]\]/", "[[RTECOLON$1]]", $text);      //change ':' => 'RTECOLON' in links
-                return parent::replaceInternalLinks($text);
+                $text = parent::replaceInternalLinks($text);
+                $text = preg_replace("/\[\[RTENOTITLE(.*?)\|/", "[[", $text);                           // remove unused RTENOTITLE
+
+                return $text;
         }
 
         function makeImage( $nt, $options ) {

plugins/mediawiki/dialogs/link.html

@@ -69 +69 @@
         if ( sHRef == null )
                 sHRef = oLink.getAttribute( 'href' , 2 ) || '' ;
                 
+        if (sHRef.toLowerCase().StartsWith( 'rtenotitle' ) )
+        {
+                sHRef = sHRef.substring(10);
+                bLinkEqualsName = true;
+        }
+                
         if ( sHRef == oLink.innerHTML )
                 bLinkEqualsName = true ;
 
@@ -180 +186 @@
 function Ok()
 {
         var sUri = GetE('txtUrl').value ;
+        var realUri = sUri;
+        if ( bLinkEqualsName ) {
+                sUri = 'RTENOTITLE'+ sUri;
+        }
         if (sUri.StartsWith( ':' ) )
                 sUri = sUri.replace(/:/, "rtecolon");
         var sInnerHtml ;
@@ -215 +225 @@
                 SetAttribute( oLink, '_fcksavedurl', sUri ) ;
 
                 if ( bLinkEqualsName )
-                        oLink.innerHTML = sUri ;
+                        oLink.innerHTML = realUri ;
                 else
                         oLink.innerHTML = sInnerHtml ;          // Set (or restore) the innerHTML
 

plugins/mediawiki/fckplugin.js

@@ -344 +344 @@
 
                                                 case 'a' :
 
+                                                        var pipeline = true;
                                                         // Get the actual Link href.
                                                         var href = htmlNode.getAttribute( '_fcksavedurl' ) ;
                                                         var hrefType            = htmlNode.getAttribute( '_fck_mw_type' ) || '' ;
@@ -365 +366 @@
                                                                 var isWikiUrl = !( href.StartsWith( 'mailto:' ) || /^\w+:\/\//.test( href ) ) ;
                                                                 stringBuilder.push( isWikiUrl ? '[[' : '[' ) ;
                                                         }
+                                                        //#2223
+                                                        if (href.toLowerCase().StartsWith( 'rtenotitle' ))
+                                                        {
+                                                                href = href.substring(10);
+                                                                if ( htmlNode.innerHTML == href ) pipeline = false;
+                                                        }
                                                         if (href.toLowerCase().StartsWith( 'rtecolon' ))                //change 'rtecolon=' => ':' in links
                                                         {
                                                                 stringBuilder.push(':');
                                                                 href = href.substring(8);
                                                         }
                                                         stringBuilder.push( href ) ;
-                                                        if ( htmlNode.innerHTML != '[n]' && (!isWikiUrl || href != htmlNode.innerHTML || !href.toLowerCase().StartsWith("category:")))
+                                                        if ( pipeline && htmlNode.innerHTML != '[n]' && (!isWikiUrl || href != htmlNode.innerHTML || !href.toLowerCase().StartsWith("category:")))
                                                         {
                                                                 stringBuilder.push( isWikiUrl? '|' : ' ' ) ;
                                                                 this._AppendChildNodes( htmlNode, stringBuilder, prefix ) ;