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

As I've removed most of Roans reason to use php magic variables, completely remove them this time.

Browse source 
Followup r84430
This commit is contained in:
Sam Reed 2011-03-20 22:46:09 +00:00
parent 24d0b16dc9
commit cf023d04dc
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
includes/api/ApiQueryBase.php
View file

@ -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();