Ticket #2386: 2386_4.patch

FCKeditorSajax.body.php

@@ -93 +93 @@
 }
 
 function wfSajaxSearchArticleFCKeditor( $term ) {
-        global $wgContLang, $wgOut;
+        global $wgContLang, $wgOut, $wgExtraNamespaces;
         $limit = 10;
         $ns = NS_MAIN;
 
         $term = $wgContLang->checkTitleEncoding( $wgContLang->recodeInput( js_unescape( $term ) ) );
 
-        if (strpos($term, "Category:") === 0) {
+        if (strpos(strtolower($term), "category:") === 0) {
                 $ns = NS_CATEGORY;
                 $term = substr($term, 9);
                 $prefix = "Category:";
         }
-        else if (strpos($term, ":Category:") === 0) {
+        else if (strpos(strtolower($term), ":category:") === 0) {
                 $ns = NS_CATEGORY;
                 $term = substr($term, 10);
                 $prefix = ":Category:";
         }
+        else if (strpos(strtolower($term), "media:") === 0) {
+                $ns = NS_IMAGE;
+                $term = substr($term, 6);
+                $prefix = "Media:";
+        }
+        else if (strpos(strtolower($term), ":image:") === 0) {
+                $ns = NS_IMAGE;
+                $term = substr(strtolower($term), 7);
+                $prefix = ":Image:";
+        }
+        else if ( strpos($term,":") && is_array($wgExtraNamespaces )) {
+                $pos = strpos($term,":");
+                $find_ns = array_search(substr($term,0,$pos),$wgExtraNamespaces);
+                if ($find_ns) {
+                        $ns = $find_ns;
+                        $prefix = substr($term,0,$pos+1);
+                        $term = substr($term,$pos+1);
+                }
+        }
 
         $term1 = str_replace( ' ', '_', $wgContLang->ucfirst( $term ) );
         $term2 = str_replace( ' ', '_', $wgContLang->lc( $term ) );

plugins/mediawiki/dialogs/link.html

@@ -192 +192 @@
         var aLinks = oLink ? [ oLink ] : oEditor.FCK.CreateLink( sUri ) ;
 
         // If no selection, no links are created, so use the uri as the link text (by dom, 2006-05-26)
+        var noTitle = false;
         var aHasSelection = ( aLinks.length > 0 ) ;
         if ( !aHasSelection )
         {
-                sInnerHtml = sUri;
+                sInnerHtml = realUri;
+                noTitle = true;
 
                 var oLinkPathRegEx = new RegExp("//?([^?\"']+)([?].*)?$") ;
-                var asLinkPath = oLinkPathRegEx.exec( sUri ) ;
+                var asLinkPath = oLinkPathRegEx.exec( realUri ) ;
                 if (asLinkPath != null)
                         sInnerHtml = asLinkPath[1];  // use matched path
 
@@ -223 +225 @@
                 else
                         oLink.innerHTML = sInnerHtml ;          // Set (or restore) the innerHTML
 
+                if ( noTitle )
+                        SetAttribute( oLink, '_fcknotitle','true');
         }
 
         // Select the (first) link.

plugins/mediawiki/fckplugin.js

@@ -403 +403 @@
                                                         //#2223
                                                         if (htmlNode.getAttribute( '_fcknotitle' ) && htmlNode.getAttribute( '_fcknotitle' ) == "true")
                                                         {
-                                                                var testInner = FCKConfig.ProtectedSource.Revert(htmlNode.innerHTML, 0);
+                                                                var testHref = FCKConfig.ProtectedSource.Revert(href, 0);
                                                                 if (href.toLowerCase().StartsWith( 'category:' )) testInner = 'Category:'+testInner;
-                                                                testInner = testInner.replace(/&/, "&")
-                                                                if ( testInner == FCKConfig.ProtectedSource.Revert(href, 0) ) pipeline = false;
+                                                                if (testHref.toLowerCase().StartsWith( 'rtecolon' ) )
+                                                                        testHref = testHref.replace( /rtecolon/, ":" ) ;
+                                                                testInner = testInner.replace( /&/, "&" ) ;
+                                                                if ( testInner == testHref ) pipeline = false ;
                                                         }
                                                         if (href.toLowerCase().StartsWith( 'rtecolon' ))                //change 'rtecolon=' => ':' in links
                                                         {