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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 27ddba6..f98fae0 100644 (file)
--- 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 b61449b..d4c3997 100644 (file)
--- 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 {