Just use @ here too
authorAaron Schulz <aaron@users.mediawiki.org>
Sat, 10 May 2008 13:42:07 +0000 (13:42 +0000)
committerAaron Schulz <aaron@users.mediawiki.org>
Sat, 10 May 2008 13:42:07 +0000 (13:42 +0000)
includes/Database.php

index 1df8571..001b044 100644 (file)
@@ -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 ) );