From: Yuri Astrakhan <yurik@wikimedia.org>
Date: Thu, 25 Sep 2014 02:13:19 +0000 (-0400)
Subject: Minor code cleanup and a doc type cleanup
X-Git-Tag: 1.31.0-rc.0~13828
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=89ac348b77aa68ad487a0cc1f5583acc27ccd8a3;p=lhc%2Fweb%2Fwiklou.git

Minor code cleanup and a doc type cleanup

Change-Id: Ib89226a83738d1205405eac3926bfaa578966133
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index a9925ffeca..8a55b1df6d 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2230,11 +2230,7 @@ class EditPage {
 	 *   $this->allowNonTextContent is not true.
 	 */
 	protected function toEditText( $content ) {
-		if ( $content === null || $content === false ) {
-			return $content;
-		}
-
-		if ( is_string( $content ) ) {
+		if ( $content === null || $content === false || is_string( $content ) ) {
 			return $content;
 		}
 
diff --git a/includes/Status.php b/includes/Status.php
index 1a72968be2..2a9d173ec0 100644
--- a/includes/Status.php
+++ b/includes/Status.php
@@ -184,9 +184,9 @@ class Status {
 	/**
 	 * Get the error list as a wikitext formatted list
 	 *
-	 * @param string $shortContext A short enclosing context message name, to
+	 * @param string|bool $shortContext A short enclosing context message name, to
 	 *        be used when there is a single error
-	 * @param string $longContext A long enclosing context message name, for a list
+	 * @param string|bool $longContext A long enclosing context message name, for a list
 	 * @return string
 	 */
 	public function getWikiText( $shortContext = false, $longContext = false ) {