From d7f465f7e88c13b853abb5c5c9a1148a38621ec8 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Mon, 10 Feb 2014 21:52:01 -0800 Subject: [PATCH] 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 --- includes/WikiPage.php | 5 +++++ 1 file changed, 5 insertions(+) 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__ ); -- 2.20.1