From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 27 Feb 2011 00:40:06 +0000 (+0000)
Subject: Tweak some documentation
X-Git-Tag: 1.31.0-rc.0~31738
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=dcda4332c99afd32ad9506f1b094877b5f4793db;p=lhc%2Fweb%2Fwiklou.git

Tweak some documentation

Add some braces

Explicitally define a variable
---

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 6b28c642aa..62ec6dc8f8 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -114,6 +114,7 @@ class UserMailer {
 		global $wgEnotifMaxRecips, $wgAdditionalMailParams;
 
 		if ( is_array( $to ) ) {
+			$emails = '';
 			// This wouldn't be necessary if implode() worked on arrays of
 			// objects using __toString(). http://bugs.php.net/bug.php?id=36612
 			foreach ( $to as $t ) {
diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index 341dd6c7fb..7673f0a99b 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -219,7 +219,9 @@ class ApiQueryImageInfo extends ApiQueryBase {
 	 * @return Array of parameters for transform.
 	 */
 	protected function mergeThumbParams ( $image, $thumbParams, $otherParams ) {
-		if ( !$otherParams ) return $thumbParams;
+		if ( !$otherParams ) {
+			return $thumbParams;
+		}
 		$p = $this->getModulePrefix();
 
 		$h = $image->getHandler();
diff --git a/includes/api/ApiQueryProtectedTitles.php b/includes/api/ApiQueryProtectedTitles.php
index a3f011990a..66162c2391 100644
--- a/includes/api/ApiQueryProtectedTitles.php
+++ b/includes/api/ApiQueryProtectedTitles.php
@@ -208,8 +208,8 @@ class ApiQueryProtectedTitles extends ApiQueryGeneratorBase {
 			'prop' => array(
 				'Which properties to get',
 				' timestamp      - Adds the timestamp of when protection was added',
-				' user           - Adds the user to add the protection',
-				' userid         - Adds the user id to add the protection',
+				' user           - Adds the user that added the protection',
+				' userid         - Adds the user id that added the protection',
 				' comment        - Adds the comment for the protection',
 				' parsedcomment  - Adds the parsed comment for the protection',
 				' expiry         - Adds the timestamp of when the protection will be lifted',