Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Followup r84392

Browse source 
Be a bit more explicit about the code, add a bit of readability into foreach too
This commit is contained in:
Sam Reed 2011-03-20 22:35:41 +00:00
parent 068522ccbe
commit 24d0b16dc9
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
includes/api/ApiQueryBase.php
View file

@ -251,11 +251,19 @@ abstract class ApiQueryBase extends ApiBase {
* @return ResultWrapper * @return ResultWrapper
*/ */
protected function select( $method, $extraQuery = array() ) { 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. // Merge $this->tables with $extraQuery['tables'], $this->fields with $extraQuery['fields'], etc.
foreach ( array( 'tables', 'fields', 'where', 'options', 'join_conds' ) as $var ) { 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 // getDB has its own profileDBIn/Out calls
$db = $this->getDB(); $db = $this->getDB();