MDL-15610 Merged label log display fix from 1.9

diff --git a/mod/label/db/install.xml b/mod/label/db/install.xml
index 182cca378b33de49c8a3946a2a74a5cb1535cd5b..21b444f86ebc5545345bd9d1986ee72674f3a3ab 100644 (file)
--- a/mod/label/db/install.xml
+++ b/mod/label/db/install.xml
@@ -23,8 +23,8 @@
   <STATEMENTS>
     <STATEMENT NAME="insert log_display" TYPE="insert" TABLE="log_display" COMMENT="Initial insert of records on table log_display">
       <SENTENCES>
-        <SENTENCE TEXT="(module, action, mtable, field) VALUES ('label', 'add', 'quiz', 'name')" />
-        <SENTENCE TEXT="(module, action, mtable, field) VALUES ('label', 'update', 'quiz', 'name')" />
+        <SENTENCE TEXT="(module, action, mtable, field) VALUES ('label', 'add', 'label', 'name')" />
+        <SENTENCE TEXT="(module, action, mtable, field) VALUES ('label', 'update', 'label', 'name')" />
       </SENTENCES>
     </STATEMENT>
   </STATEMENTS>

diff --git a/mod/label/db/upgrade.php b/mod/label/db/upgrade.php
index bfa9812af9a90b5660b71e545517f2ffc8c7a418..4641a16abd77286540443799850dda799fd14e36 100644 (file)
--- a/mod/label/db/upgrade.php
+++ b/mod/label/db/upgrade.php
@@ -32,6 +32,9 @@ function xmldb_label_upgrade($oldversion=0) {
 /// }
 
 //===== 1.9.0 upgrade line ======//
+    if ($oldversion < 2007101510) {
+        execute_sql("UPDATE {$CFG->prefix}log_display SET mtable = 'label' WHERE module = 'label'", 'false');
+    }
 
     return $result;
 }

diff --git a/mod/label/version.php b/mod/label/version.php
index 0a88866602d9a70beee97ee4d596b49b5b69a4be..b25e9847c8d30c8e6c17e13f6e84204d071cc7ad 100644 (file)
--- a/mod/label/version.php
+++ b/mod/label/version.php
@@ -5,7 +5,7 @@
 ///  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 /////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2007101509;  // The current module version (Date: YYYYMMDDXX)
+$module->version  = 2007101510;  // The current module version (Date: YYYYMMDDXX)
 $module->requires = 2007101509;  // Requires this Moodle version
 $module->cron     = 0;           // Period for cron to check this module (secs)