From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Sat, 17 Jan 2009 09:56:38 +0000 (+0000)
Subject: Fix up r45819 per CR comments: removing calls to removed function Database::indexName()
X-Git-Tag: 1.31.0-rc.0~43380
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=21ead1462a041e16eb151260675faee902683d71;p=lhc%2Fweb%2Fwiklou.git

Fix up r45819 per CR comments: removing calls to removed function Database::indexName()
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index e2175d108b..81bc1b2900 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1191,7 +1191,6 @@ class Database {
 		# SHOW INDEX should work for 3.x and up:
 		# http://dev.mysql.com/doc/mysql/en/SHOW_INDEX.html
 		$table = $this->tableName( $table );
-		$index = $this->indexName( $index );
 		$sql = 'SHOW INDEX FROM '.$table;
 		$res = $this->query( $sql, $fname );
 		if ( !$res ) {
diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index c91374bb27..b80cd6868b 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -194,7 +194,7 @@ class DatabaseSqlite extends Database {
 	 * - if errors are explicitly ignored, returns NULL on failure
 	 */
 	function indexInfo($table, $index, $fname = 'Database::indexExists') {
-		$sql = 'PRAGMA index_info(' . $this->addQuotes( $this->indexName( $index ) ) . ')';
+		$sql = 'PRAGMA index_info(' . $this->addQuotes( $index ) . ')';
 		$res = $this->query( $sql, $fname );
 		if ( !$res ) {
 			return null;
@@ -213,7 +213,7 @@ class DatabaseSqlite extends Database {
 		$row = $this->selectRow( 'sqlite_master', '*', 
 			array(
 				'type' => 'index',
-				'name' => $this->indexName( $index ),
+				'name' => $index,
 			), $fname );
 		if ( !$row || !isset( $row->sql ) ) {
 			return null;