From ce6ab1b96b61277fddf541d0d2adb21bea567365 Mon Sep 17 00:00:00 2001 From: Fred Woolard Date: Fri, 6 Jul 2012 16:29:05 -0400 Subject: [PATCH] MDL-34211 Use the $table_name argument to check against $metatables key values --- lib/ddl/mysql_sql_generator.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/ddl/mysql_sql_generator.php b/lib/ddl/mysql_sql_generator.php index abd5ddde856..bbd6de2a96e 100644 --- a/lib/ddl/mysql_sql_generator.php +++ b/lib/ddl/mysql_sql_generator.php @@ -364,18 +364,14 @@ class mysql_sql_generator extends sql_generator { */ public function isNameInUse($object_name, $type, $table_name) { - // Calculate the real table name - $xmldb_table = new xmldb_table($table_name); - $tname = $this->getTableName($xmldb_table); - switch($type) { case 'ix': case 'uix': // First of all, check table exists $metatables = $this->mdb->get_tables(); - if (isset($metatables[$tname])) { + if (isset($metatables[$table_name])) { // Fetch all the indexes in the table - if ($indexes = $this->mdb->get_indexes($tname)) { + if ($indexes = $this->mdb->get_indexes($table_name)) { // Look for existing index in array if (isset($indexes[$object_name])) { return true;