From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 24 Aug 2015 21:32:53 +0000 (-0700)
Subject: Avoid $newid IDEA "possibly undefined" error in insertOn()
X-Git-Tag: 1.31.0-rc.0~10261
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=d56267b23b43f29576088fff79b221053591435a;p=lhc%2Fweb%2Fwiklou.git

Avoid $newid IDEA "possibly undefined" error in insertOn()

Change-Id: Ifb0dbc60efc346227e0724ec1df2e60e8dd5f495
---

diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index b129bd26b4..069896c303 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1199,10 +1199,9 @@ class WikiPage implements Page, IDBAccessObject {
 	 * Best if all done inside a transaction.
 	 *
 	 * @param DatabaseBase $dbw
-	 * @return int The newly created page_id key, or false if the title already existed
+	 * @return int|bool The newly created page_id key; false if the title already existed
 	 */
 	public function insertOn( $dbw ) {
-
 		$page_id = $dbw->nextSequenceValue( 'page_page_id_seq' );
 		$dbw->insert( 'page', array(
 			'page_id'           => $page_id,
@@ -1223,9 +1222,11 @@ class WikiPage implements Page, IDBAccessObject {
 			$newid = $dbw->insertId();
 			$this->mId = $newid;
 			$this->mTitle->resetArticleID( $newid );
-		}
 
-		return $affected ? $newid : false;
+			return $newid;
+		} else {
+			return false;
+		}
 	}
 
 	/**