From: kaldari <rkaldari@wikimedia.org>
Date: Fri, 20 Feb 2015 19:09:43 +0000 (-0800)
Subject: Adding sample code to TemplateParser::processTemplate() docs
X-Git-Tag: 1.31.0-rc.0~12293^2
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=13aff8aa7c67c3f562441fb347762b82d7e6110b;p=lhc%2Fweb%2Fwiklou.git

Adding sample code to TemplateParser::processTemplate() docs

Also reverting punctuation that was accidently changed in
change I28cd13d4d.

Change-Id: I1283fbfbaf8cefbbc951599ee286d923b9dedf65
---

diff --git a/includes/TemplateParser.php b/includes/TemplateParser.php
index 41ae4a4a53..559ffb9ba2 100644
--- a/includes/TemplateParser.php
+++ b/includes/TemplateParser.php
@@ -166,6 +166,16 @@ class TemplateParser {
 
 	/**
 	 * Returns HTML for a given template by calling the template function with the given args
+	 *
+	 * @code
+	 *     echo $templateParser->processTemplate(
+	 *         'ExampleTemplate',
+	 *         array(
+	 *             'username' => $user->getName(),
+	 *             'message' => 'Hello!'
+	 *         )
+	 *     );
+	 * @endcode
 	 * @param string $templateName The name of the template
 	 * @param mixed $args
 	 * @param array $scopes
diff --git a/includes/templates/NoLocalSettings.mustache b/includes/templates/NoLocalSettings.mustache
index 8a4616c455..545794919e 100644
--- a/includes/templates/NoLocalSettings.mustache
+++ b/includes/templates/NoLocalSettings.mustache
@@ -31,7 +31,7 @@
 				<p>Please <a href="{{path}}mw-config/index.{{ext}}">complete the installation</a> and download LocalSettings.php.</p>
 			{{/installerStarted}}
 			{{^installerStarted}}
-				<p>Please <a href="{{path}}mw-config/index.{{ext}}">set up the wiki</a> first!</p>
+				<p>Please <a href="{{path}}mw-config/index.{{ext}}">set up the wiki</a> first.</p>
 			{{/installerStarted}}
 		{{/localSettingsExists}}
 		</div>