From: Chad Horohoe <chadh@wikimedia.org>
Date: Tue, 11 Feb 2014 05:52:01 +0000 (-0800)
Subject: Return early when page id is less than 1
X-Git-Tag: 1.31.0-rc.0~16931^2
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=d7f465f7e88c13b853abb5c5c9a1148a38621ec8;p=lhc%2Fweb%2Fwiklou.git

Return early when page id is less than 1

Wasteful DB query when we know the page won't exist.

Bug: 61166
Change-Id: I8943b4dec5088dadffefbd74f54653cb09043b7c
---

diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index a191983d42..ee6f57437f 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -142,6 +142,11 @@ class WikiPage implements Page, IDBAccessObject {
 	 * @return WikiPage|null
 	 */
 	public static function newFromID( $id, $from = 'fromdb' ) {
+		// page id's are never 0 or negative, see bug 61166
+		if ( $id < 1 ) {
+			return;
+		}
+
 		$from = self::convertSelectType( $from );
 		$db = wfGetDB( $from === self::READ_LATEST ? DB_MASTER : DB_SLAVE );
 		$row = $db->selectRow( 'page', self::selectFields(), array( 'page_id' => $id ), __METHOD__ );