MDL-25227 glossary - fix delete_instance() and clean orphaned entries

moodle · Nov 15, 2010 · 3b95347 · 3b95347
1 parent f3cc571
commit 3b95347
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/mod/glossary/db/upgrade.php b/mod/glossary/db/upgrade.php
@@ -299,6 +299,16 @@ function xmldb_glossary_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2010042800, 'glossary');
     }
 
+    if ($oldversion < 2010111500) {
+        // Delete orphaned glossary_entries not belonging to any glossary (MDL-25227)
+        $sql = "DELETE FROM {glossary_entries}
+                WHERE NOT EXISTS (
+                    SELECT 'x' FROM {glossary} g
+                    WHERE g.id = glossaryid)";
+        $DB->execute($sql);
+
+        upgrade_mod_savepoint(true, 2010111500, 'glossary');
+    }
     return true;
 }
 

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
@@ -194,6 +194,7 @@ function glossary_delete_instance($id) {
     $category_select = "SELECT id FROM {glossary_categories} WHERE glossaryid = ?";
     $DB->delete_records_select('glossary_entries_categories', "categoryid IN ($category_select)", array($id));
     $DB->delete_records('glossary_categories', array('glossaryid'=>$id));
+    $DB->delete_records('glossary_entries', array('glossaryid'=>$id));
 
     // delete all files
     $fs->delete_area_files($context->id);

diff --git a/mod/glossary/version.php b/mod/glossary/version.php
@@ -5,7 +5,7 @@
 ///  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 /////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2010080300;
+$module->version  = 2010111500;
 $module->requires = 2010080300;  // Requires this Moodle version
 $module->cron     = 0;           // Period for cron to check this module (secs)