From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sat, 10 May 2008 13:42:07 +0000 (+0000)
Subject: Just use @ here too
X-Git-Tag: 1.31.0-rc.0~47737
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=077e144c05d924821e450a259786192c9a26fd62;p=lhc%2Fweb%2Fwiklou.git

Just use @ here too
---

diff --git a/includes/Database.php b/includes/Database.php
index 1df8571a09..001b0448c8 100644
--- 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 ) );