From 48906dde12f2380c2aaa147d1da7bec953b40eeb Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 30 Sep 2015 19:42:26 -0700 Subject: [PATCH] Fixed remaning IDEA errors in DatabaseBase Change-Id: Ife8d7ecd4f224f1e2ef6f729765c303ec69a3f5f --- includes/db/Database.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/includes/db/Database.php b/includes/db/Database.php index e4143c63c8..4bbb4915a3 100644 --- a/includes/db/Database.php +++ b/includes/db/Database.php @@ -1061,8 +1061,8 @@ abstract class DatabaseBase implements IDatabase { $res = $this->resultObject( $ret ); // Destroy profile sections in the opposite order to their creation - $queryProfSection = false; - $totalProfSection = false; + ScopedCallback::consume( $queryProfSection ); + ScopedCallback::consume( $totalProfSection ); if ( $isWriteQuery && $this->mTrxLevel ) { $this->mTrxWriteDuration += $queryRuntime; @@ -1232,6 +1232,7 @@ abstract class DatabaseBase implements IDatabase { * @param string|array $options The query options. See DatabaseBase::select() for details. * * @return bool|mixed The value from the field, or false on failure. + * @throws DBUnexpectedError */ public function selectField( $table, $var, $cond = '', $fname = __METHOD__, $options = array() @@ -3193,11 +3194,6 @@ abstract class DatabaseBase implements IDatabase { $args = func_get_args(); $function = array_shift( $args ); $tries = self::DEADLOCK_TRIES; - if ( is_array( $function ) ) { - $fname = $function[0]; - } else { - $fname = $function; - } $this->begin( __METHOD__ ); -- 2.20.1