From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 11 Sep 2017 18:26:11 +0000 (+0000)
Subject: Merge "Show a warning in edit preview when a template loop is detected"
X-Git-Tag: 1.31.0-rc.0~2152
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=2480aae0c97d822e10b50619e7b48b25c45af073;hp=18ad4f5e13b479f4d32f825b6f23e53a3b44f3cf

Merge "Show a warning in edit preview when a template loop is detected"
---

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 988e2488d8..ff4936d035 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -3231,6 +3231,8 @@ class Parser {
 					. wfMessage( 'parser-template-loop-warning', $titleText )->inContentLanguage()->text()
 					. '</span>';
 				$this->addTrackingCategory( 'template-loop-category' );
+				$this->mOutput->addWarning( wfMessage( 'template-loop-warning',
+					wfEscapeWikiText( $titleText ) )->text() );
 				wfDebug( __METHOD__ . ": template loop broken at '$titleText'\n" );
 			}
 		}
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 4b01132e37..8add481fdb 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -779,6 +779,7 @@
 	"parser-template-loop-warning": "Template loop detected: [[$1]]",
 	"template-loop-category": "Pages with template loops",
 	"template-loop-category-desc": "The page contains a template loop, ie. a template which calls itself recursively.",
+	"template-loop-warning": "<strong>Warning:</strong> This page calls [[:$1]] which causes a template loop (an infinite recursive call).",
 	"parser-template-recursion-depth-warning": "Template recursion depth limit exceeded ($1)",
 	"language-converter-depth-warning": "Language converter depth limit exceeded ($1)",
 	"node-count-exceeded-category": "Pages where node count is exceeded",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index a92504a3bb..56cbbbd49d 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -970,6 +970,7 @@
 	"parser-template-loop-warning": "Parameters:\n* $1 - page title",
 	"template-loop-category": "This message is used as a category name for a [[mw:Special:MyLanguage/Help:Tracking categories|tracking category]] where pages with template loops will be listed.",
 	"template-loop-category-desc": "Pages with template loops category description. Shown on [[Special:TrackingCategories]].\n\nSee also:\n* {{msg-mw|Template-loop-category}}",
+	"template-loop-warning": "This message is displayed in edit preview when a template loop is detected on the previewed page.\n\nParameters:\n* $1 - the full title of template which causes the template loop.",
 	"parser-template-recursion-depth-warning": "Parameters:\n* $1 - limit value of recursion depth",
 	"language-converter-depth-warning": "Error message shown when a page uses too deeply nested language conversion syntax. Parameters:\n* $1 - the value of the depth limit",
 	"node-count-exceeded-category": "This message is used as a category name for a [[mw:Help:Tracking categories|tracking category]] where pages are placed automatically if the node-count of the preprocessor exceeds the limit.\n\nSee also:\n* {{msg-mw|Node-count-exceeded-warning}}",