From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Sat, 10 May 2008 09:49:21 +0000 (+0000)
Subject: E_NOTICE: $options['USE_INDEX'] might not be set
X-Git-Tag: 1.31.0-rc.0~47750
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=2dc88c06027add435d38e17eb6442ebf26d6e2cf;p=lhc%2Fweb%2Fwiklou.git

E_NOTICE: $options['USE_INDEX'] might not be set
---

diff --git a/includes/Database.php b/includes/Database.php
index 9d9a1778a0..3c27e66fc8 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -945,7 +945,7 @@ class Database {
 		}
 		if( is_array( $table ) ) {
 			if ( !empty($join_conds) || (isset($options['USE INDEX']) && is_array($options['USE INDEX'])) )
-				$from = ' FROM ' . $this->tableNamesWithUseIndexOrJOIN( $table, $options['USE INDEX'], $join_conds );
+				$from = ' FROM ' . $this->tableNamesWithUseIndexOrJOIN( $table, @$options['USE INDEX'], $join_conds );
 			else
 				$from = ' FROM ' . implode( ',', array_map( array( &$this, 'tableName' ), $table ) );
 		} elseif ($table!='') {