jenkins-bot has submitted this change and it was merged.
Change subject: Avoid $newid IDEA "possibly undefined" error in insertOn()
......................................................................
Avoid $newid IDEA "possibly undefined" error in insertOn()
Change-Id: Ifb0dbc60efc346227e0724ec1df2e60e8dd5f495
---
M includes/page/WikiPage.php
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index b129bd2..069896c 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1199,10 +1199,9 @@
* 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 @@
$newid = $dbw->insertId();
$this->mId = $newid;
$this->mTitle->resetArticleID( $newid );
- }
- return $affected ? $newid : false;
+ return $newid;
+ } else {
+ return false;
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/233605
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb0dbc60efc346227e0724ec1df2e60e8dd5f495
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
