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

diff --git a/mod/dialogue/db/mysql.php b/mod/dialogue/db/mysql.php
index d33c339cad9c28973be10e47e3b219ae21d31bb6..6a34befb47799181bdfad485ca2d9e73e5d254d5 100644 (file)
--- a/mod/dialogue/db/mysql.php
+++ b/mod/dialogue/db/mysql.php
@@ -16,11 +16,11 @@ function dialogue_upgrade($oldversion) {
                }
     
     if ($oldversion < 2004111000) {
-        execute_sql('ALTER TABLE prefix_dialogue DROP KEY course;',false);
-        execute_sql('ALTER TABLE prefix_dialogue_conversations DROP KEY recipientid;',false);
-        execute_sql('ALTER TABLE prefix_dialogue_conversations DROP KEY userid;',false);
-        execute_sql('ALTER TABLE prefix_dialogue_entries DROP KEY dialogueid;',false);
-        execute_sql('ALTER TABLE prefix_dialogue_entries DROP KEY userid;',false);
+        execute_sql("ALTER TABLE {$CFG->prefix}dialogue DROP KEY course;",false);
+        execute_sql("ALTER TABLE {$CFG->prefix}dialogue_conversations DROP KEY recipientid;",false);
+        execute_sql("ALTER TABLE {$CFG->prefix}dialogue_conversations DROP KEY userid;",false);
+        execute_sql("ALTER TABLE {$CFG->prefix}dialogue_entries DROP KEY dialogueid;",false);
+        execute_sql("ALTER TABLE {$CFG->prefix}dialogue_entries DROP KEY userid;",false);
 
         modify_database('','ALTER TABLE prefix_dialogue ADD KEY course (course);');
         modify_database('','ALTER TABLE prefix_dialogue_conversations ADD KEY recipientid (recipientid);');

diff --git a/mod/dialogue/db/postgres7.php b/mod/dialogue/db/postgres7.php
index b62f02ec1f1ad5ca82c7c1d2fa01afec6ffb5783..7f66c0878f66cfb81e4b4d55acfae963599c1bfa 100644 (file)
--- a/mod/dialogue/db/postgres7.php
+++ b/mod/dialogue/db/postgres7.php
@@ -7,11 +7,11 @@ function dialogue_upgrade($oldversion) {
     global $CFG;
 
     if ($oldversion < 2004111000) {
-        execute_sql('DROP INDEX prefix_dialogue_course_idx;',false);
-        execute_sql('DROP INDEX prefix_dialogue_conversations_userid_idx;',false);
-        execute_sql('DROP INDEX prefix_dialogue_conversations_recipientid_idx;',false);
-        execute_sql('DROP INDEX prefix_dialogue_entries_dialogueid_idx;',false);
-        execute_sql('DROP INDEX prefix_dialogue_entries_userid_idx;',false);
+        execute_sql("DROP INDEX {$CFG->prefix}dialogue_course_idx;",false);
+        execute_sql("DROP INDEX {$CFG->prefix}dialogue_conversations_userid_idx;",false);
+        execute_sql("DROP INDEX {$CFG->prefix}dialogue_conversations_recipientid_idx;",false);
+        execute_sql("DROP INDEX {$CFG->prefix}dialogue_entries_dialogueid_idx;",false);
+        execute_sql("DROP INDEX {$CFG->prefix}dialogue_entries_userid_idx;",false);
 
         modify_database('','CREATE INDEX prefix_dialogue_course_idx ON prefix_dialogue (course);');
         modify_database('','CREATE INDEX prefix_dialogue_conversations_userid_idx ON prefix_dialogue_conversations (userid);');