From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 24 Jul 2004 10:55:35 +0000 (+0000)
Subject: tidy-resistant placeholder
X-Git-Tag: 1.5.0alpha1~2605
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=2a2ef856f78cf1f420a52288a46b6a4a77e501be;p=lhc%2Fweb%2Fwiklou.git

tidy-resistant placeholder
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index e58974e493..96c5358978 100644
--- 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 8357926f6d..19f017c9b4 100644
--- 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() ;