dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
228f097
)
Just use @ here too
author
Aaron Schulz
<aaron@users.mediawiki.org>
Sat, 10 May 2008 13:42:07 +0000
(13:42 +0000)
committer
Aaron Schulz
<aaron@users.mediawiki.org>
Sat, 10 May 2008 13:42:07 +0000
(13:42 +0000)
includes/Database.php
patch
|
blob
|
history
diff --git
a/includes/Database.php
b/includes/Database.php
index
1df8571
..
001b044
100644
(file)
--- a/
includes/Database.php
+++ b/
includes/Database.php
@@
-944,7
+944,7
@@
class Database {
$options = array( $options );
}
if( is_array( $table ) ) {
- if ( !empty($join_conds) ||
(isset($options['USE INDEX']) && is_array($options['USE INDEX'])
) )
+ if ( !empty($join_conds) ||
is_array( @$options['USE INDEX']
) )
$from = ' FROM ' . $this->tableNamesWithUseIndexOrJOIN( $table, @$options['USE INDEX'], $join_conds );
else
$from = ' FROM ' . implode( ',', array_map( array( &$this, 'tableName' ), $table ) );