From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 3 Dec 2005 03:12:33 +0000 (+0000)
Subject: * Tweak infinite-template-handling loop for PHP 5.1.1 string handling change
X-Git-Tag: 1.6.0~1067
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/supprimer.php?a=commitdiff_plain;h=bbd8b9170e36d606e0651c86df334f8d34aecfeb;p=lhc%2Fweb%2Fwiklou.git

* Tweak infinite-template-handling loop for PHP 5.1.1 string handling change
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 27ddba655c..f98fae0f23 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -278,6 +278,7 @@ fully support the editing toolbar, but was found to be too confusing.
   on Special:Upload as well as edit, rearrange edit page pieces a bit.
   Copyright warning now above the buttons to ensure it's visible,
   template list at the bottom so it can grow.
+* Tweak infinite-template-handling loop for PHP 5.1.1 string handling change
 
 
 === Caveats ===
diff --git a/includes/Parser.php b/includes/Parser.php
index b61449bff5..d4c39976de 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -2413,7 +2413,7 @@ class Parser
 				$noparse = true;
 				$found = true;
 				$text = $linestart .
-					"\{\{$part1}}" .
+					'{{' . $part1 . '}}' .
 					'<!-- WARNING: template loop detected -->';
 				wfDebug( "$fname: template loop broken at '$part1'\n" );
 			} else {