From 24d0b16dc9010e10d2bc54ab65d77bde5b478abf Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Sun, 20 Mar 2011 22:35:41 +0000 Subject: [PATCH] Followup r84392 Be a bit more explicit about the code, add a bit of readability into foreach too --- includes/api/ApiQueryBase.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php index 3fca7827ab..4fd1276530 100644 --- a/includes/api/ApiQueryBase.php +++ b/includes/api/ApiQueryBase.php @@ -251,11 +251,19 @@ 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 ) { - $$var = array_merge( $this->{$var}, isset( $extraQuery[$var] ) ? (array)$extraQuery[$var] : array() ); + if ( isset( $extraQuery[$var] ) ) { + $$var = array_merge( $$var, (array)$extraQuery[$var] ); + } } - + // getDB has its own profileDBIn/Out calls $db = $this->getDB(); -- 2.20.1