Changeset 2394

Timestamp:

2008-08-29 17:21:56 (4 months ago)

Author:

arczi

Message:

#2223 Fixed unnecessary pipelines

Location:

MediaWiki/trunk

Files:

• FCKeditorParser.body.php (modified) (1 diff)
• mw12/FCKeditorParser_OldPP.body.php (modified) (1 diff)
• plugins/mediawiki/dialogs/link.html (modified) (3 diffs)
• plugins/mediawiki/fckplugin.js (modified) (3 diffs)

MediaWiki/trunk/FCKeditorParser.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;
         }
 

MediaWiki/trunk/mw12/FCKeditorParser_OldPP.body.php

@@ -308 +308 @@
 
         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;
         }
 

MediaWiki/trunk/plugins/mediawiki/dialogs/link.html

@@ -70 +70 @@
                 sHRef = oLink.getAttribute( 'href' , 2 ) || '' ;
                 
+        if (sHRef.toLowerCase().StartsWith( 'rtenotitle' ) )
+        {
+                sHRef = sHRef.substring(10);
+                bLinkEqualsName = true;
+        }
+                
         if ( sHRef == oLink.innerHTML )
                 bLinkEqualsName = true ;
@@ -181 +187 @@
 {
         var sUri = GetE('txtUrl').value ;
+        var realUri = sUri;
+        if ( bLinkEqualsName ) {
+                sUri = 'RTENOTITLE'+ sUri;
+        }
         if (sUri.StartsWith( ':' ) )
                 sUri = sUri.replace(/:/, "rtecolon");
@@ -216 +226 @@
 
                 if ( bLinkEqualsName )
-                        oLink.innerHTML = sUri ;
+                        oLink.innerHTML = realUri ;
                 else
                         oLink.innerHTML = sInnerHtml ;          // Set (or restore) the innerHTML

MediaWiki/trunk/plugins/mediawiki/fckplugin.js

@@ -345 +345 @@
                                                 case 'a' :
 
+                                                        var pipeline = true;
                                                         // Get the actual Link href.
                                                         var href = htmlNode.getAttribute( '_fcksavedurl' ) ;
@@ -366 +367 @@
                                                                 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
                                                         {
@@ -372 +379 @@
                                                         }
                                                         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? '|' : ' ' ) ;