From cf023d04dc5158b188fac1ac9654d1f7f0c98b06 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Sun, 20 Mar 2011 22:46:09 +0000 Subject: [PATCH] As I've removed most of Roans reason to use php magic variables, completely remove them this time. Followup r84430 --- includes/api/ApiQueryBase.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php index 4fd1276530..c9c2273f5a 100644 --- a/includes/api/ApiQueryBase.php +++ b/includes/api/ApiQueryBase.php @@ -251,18 +251,12 @@ abstract class ApiQueryBase extends ApiBase { * @return ResultWrapper */ protected function select( $method, $extraQuery = array() ) { - $tables = $this->tables; - $fields = $this->fields; - $where = $this->where; - $options = $this->options; - $join_conds = $this->join_conds; - - // Merge $this->tables with $extraQuery['tables'], $this->fields with $extraQuery['fields'], etc. - foreach ( array( 'tables', 'fields', 'where', 'options', 'join_conds' ) as $var ) { - if ( isset( $extraQuery[$var] ) ) { - $$var = array_merge( $$var, (array)$extraQuery[$var] ); - } - } + + $tables = array_merge( $this->tables, isset( $extraQuery['tables'] ) ? (array)$extraQuery['tables'] : array() ); + $fields = array_merge( $this->fields, isset( $extraQuery['fields'] ) ? (array)$extraQuery['fields'] : array() ); + $where = array_merge( $this->where, isset( $extraQuery['where'] ) ? (array)$extraQuery['where'] : array() ); + $options = array_merge( $this->options, isset( $extraQuery['options'] ) ? (array)$extraQuery['options'] : array() ); + $join_conds = array_merge( $this->join_conds, isset( $extraQuery['join_conds'] ) ? (array)$extraQuery['join_conds'] : array() ); // getDB has its own profileDBIn/Out calls $db = $this->getDB(); -- 2.20.1