Changeset 1884 for MediaWiki/trunk

Timestamp:

2008-04-03 13:25:33 (5 months ago)

Author:

wwalc

Message:

Attempt to fix #2084. Formatting of Category links.

Location:

MediaWiki/trunk

Files:

• FCKeditorParser.body.php (modified) (1 diff)
• mw12/FCKeditorParser_OldPP.body.php (modified) (1 diff)
• plugins/mediawiki/fckplugin.js (modified) (1 diff)

MediaWiki/trunk/FCKeditorParser.body.php

@@ -453 +453 @@
                         $appendString = "";
                         foreach ($categories as $cat=>$val) {
-                                $appendString .= "<a href=\"Category:" . $cat ."\">Category:" . $cat ."</a> ";
+                                if ($val != $title->mTextform) {
+                                        $appendString .= "<a href=\"Category:" . $cat ."\">" . $val ."</a> ";
+                                }
+                                else {
+                                        $appendString .= "<a href=\"Category:" . $cat ."\">Category:" . $cat ."</a> ";
+                                }
                         }
                         $parserOutput->setText($parserOutput->getText() . $appendString);

MediaWiki/trunk/mw12/FCKeditorParser_OldPP.body.php

@@ -453 +453 @@
                         $appendString = "";
                         foreach ($categories as $cat=>$val) {
-                                $appendString .= "<a href=\"Category:" . $cat ."\">Category:" . $cat ."</a> ";
+                                if ($val != $title->mTextform) {
+                                        $appendString .= "<a href=\"Category:" . $cat ."\">" . $val ."</a> ";
+                                }
+                                else {
+                                        $appendString .= "<a href=\"Category:" . $cat ."\">Category:" . $cat ."</a> ";
+                                }
                         }
                         $parserOutput->setText($parserOutput->getText() . $appendString);

MediaWiki/trunk/plugins/mediawiki/fckplugin.js

@@ -300 +300 @@
                                                         }
                                                         stringBuilder.push( href ) ;
-                                                        //if ( href != htmlNode.innerHTML && htmlNode.innerHTML != '[n]' )
-                                                        if ( htmlNode.innerHTML != '[n]' )
+                                                        if ( htmlNode.innerHTML != '[n]' && (!isWikiUrl || href != htmlNode.innerHTML || !href.toLowerCase().StartsWith("category:")))
                                                         {
                                                                 stringBuilder.push( isWikiUrl? '|' : ' ' ) ;