tidy-resistant placeholder

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index e58974e..96c5358 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -763,7 +763,7 @@ class OutputPage {
                return $ret;
        }
        
-       # Parse <tmp=> link placeholders to avoid using linkcache
+       # Parse <!--LINK--> link placeholders to avoid using linkcache
        # Placeholders created in Skin::makeLinkObj()
        function parseLinkHolders()
        {
@@ -773,7 +773,7 @@ class OutputPage {
                wfProfileIn( $fname );
                
                # Get placeholders from body
-               preg_match_all( "/<tmp=(.*?) (.*?) (.*?) (.*?)>/", $this->mBodytext, $tmpLinks );
+               preg_match_all( "/<!--LINK (.*?) (.*?) (.*?) (.*?)-->/", $this->mBodytext, $tmpLinks );
                
                if ( !empty( $tmpLinks[0] ) ) {
                        $dbr =& wfGetDB( DB_SLAVE );

diff --git a/includes/Skin.php b/includes/Skin.php
index 8357926..19f017c 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1478,8 +1478,8 @@ class Skin {
                                }
                                
                                # Allows wiki to bypass using linkcache, see OutputPage::parseLinkHolders()
-                               $retVal = "<tmp=" . implode( ' ', array( $nt->getNamespace(), $nt->getDBkey(), 
-                                       $query, $prefix . $text . $inside ) ) . ">{$trail}";
+                               $retVal = '<!--LINK ' . implode( ' ', array( $nt->getNamespace(), $nt->getDBkey(), 
+                                       $query, $prefix . $text . $inside ) ) . "-->{$trail}";
                        } else {
                                # Work out link colour immediately
                                $aid = $nt->getArticleID() ;