Replaced prefix_ with CFG->prefix for DROP of indexes before creation because of...

diff --git a/mod/chat/db/mysql.php b/mod/chat/db/mysql.php
index bea62ca47aedbb0335c00b37b995adfbc0416595..7c0ebb6c5131a17dcaa22bd4d4068ac8ee6bac70 100644 (file)
--- a/mod/chat/db/mysql.php
+++ b/mod/chat/db/mysql.php
@@ -38,12 +38,12 @@ function chat_upgrade($oldversion) {
     }
 
     if ($oldversion < 2004111200) {
-        execute_sql('ALTER TABLE prefix_chat DROP INDEX `course`;',false);
-        execute_sql('ALTER TABLE prefix_chat_messages DROP INDEX  `chatid`;',false);
-        execute_sql('ALTER TABLE prefix_chat_messages DROP INDEX `userid`;',false); 
-        execute_sql('ALTER TABLE prefix_chat_messages DROP INDEX `groupid`;',false);
-        execute_sql('ALTER TABLE prefix_chat_users DROP INDEX  `chatid`;',false); 
-        execute_sql('ALTER TABLE prefix_chat_users DROP INDEX  `groupid`;',false);
+        execute_sql("ALTER TABLE {$CFG->prefix}chat DROP INDEX `course`;",false);
+        execute_sql("ALTER TABLE {$CFG->prefix}chat_messages DROP INDEX  `chatid`;",false);
+        execute_sql("ALTER TABLE {$CFG->prefix}chat_messages DROP INDEX `userid`;",false); 
+        execute_sql("ALTER TABLE {$CFG->prefix}chat_messages DROP INDEX `groupid`;",false);
+        execute_sql("ALTER TABLE {$CFG->prefix}chat_users DROP INDEX  `chatid`;",false); 
+        execute_sql("ALTER TABLE {$CFG->prefix}chat_users DROP INDEX  `groupid`;",false);
 
         modify_database('','ALTER TABLE prefix_chat ADD INDEX `course` (`course`);');
         modify_database('','ALTER TABLE prefix_chat_messages ADD INDEX  `chatid` (`chatid`);');

diff --git a/mod/chat/db/postgres7.php b/mod/chat/db/postgres7.php
index a726b9b04d9f58dd259e3eb6a9a7ff1bf1437e05..23b683fe86aa24442ee835334a1febf87550a5f1 100644 (file)
--- a/mod/chat/db/postgres7.php
+++ b/mod/chat/db/postgres7.php
@@ -21,15 +21,15 @@ function chat_upgrade($oldversion) {
     }
 
     if ($oldversion < 2004111200) { //drop them first to avoid collisions with upgrades from 1.4.2+
-        execute_sql('DROP INDEX prefix_chat_course_idx;',false);
-        execute_sql('DROP INDEX prefix_chat_messages_chatid_idx;',false); 
-        execute_sql('DROP INDEX prefix_chat_messages_userid_idx;',false); 
-        execute_sql('DROP INDEX prefix_chat_messages_groupid_idx;',false);
-        execute_sql('DROP INDEX prefix_chat_messages_timemodifiedchatid_idx;',false); 
-        execute_sql('DROP INDEX prefix_chat_users_chatid_idx;',false); 
-        execute_sql('DROP INDEX prefix_chat_users_userid_idx;',false); 
-        execute_sql('DROP INDEX prefix_chat_users_groupid_idx;',false); 
-        execute_sql('DROP INDEX prefix_chat_users_lastping_idx;',false);
+        execute_sql("DROP INDEX {$CFG->prefix}chat_course_idx;",false);
+        execute_sql("DROP INDEX {$CFG->prefix}chat_messages_chatid_idx;",false); 
+        execute_sql("DROP INDEX {$CFG->prefix}chat_messages_userid_idx;",false); 
+        execute_sql("DROP INDEX {$CFG->prefix}chat_messages_groupid_idx;",false);
+        execute_sql("DROP INDEX {$CFG->prefix}chat_messages_timemodifiedchatid_idx;",false); 
+        execute_sql("DROP INDEX {$CFG->prefix}chat_users_chatid_idx;",false); 
+        execute_sql("DROP INDEX {$CFG->prefix}chat_users_userid_idx;",false); 
+        execute_sql("DROP INDEX {$CFG->prefix}chat_users_groupid_idx;",false); 
+        execute_sql("DROP INDEX {$CFG->prefix}chat_users_lastping_idx;",false);
 
         modify_database('','CREATE INDEX prefix_chat_course_idx ON prefix_chat(course);');
         modify_database('','CREATE INDEX prefix_chat_messages_chatid_idx ON prefix_chat_messages (chatid);');