From 11d4c2d126041fb86805aefe53f6b0fc7bea4363 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 26 Dec 2008 04:49:28 +0000 Subject: Fix a bug I introduced when I switched from module id to module name; now deleting cleans up vars and graphics rules --- core/helpers/module.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'core/helpers') diff --git a/core/helpers/module.php b/core/helpers/module.php index 321a33fa..498bf865 100644 --- a/core/helpers/module.php +++ b/core/helpers/module.php @@ -60,14 +60,14 @@ class module_Core { */ public static function delete($module_name) { $module = ORM::factory("module")->where("name", $module_name)->find(); - $module_id = $module->id; - $module->delete(); + if ($module->loaded) { + $db = Database::instance(); + $db->query("DELETE FROM `vars` WHERE `module_name` = '{$module->name}';"); + $db->query("DELETE FROM `graphics_rules` WHERE module_name = '{$module->name}';"); + $module->delete(); - $db = Database::instance(); - $db->query("DELETE FROM `vars` WHERE `module_name` = '{$module->name}';"); - $db->query("DELETE FROM `graphics_rules` WHERE module_name = '{$module->name}';"); - - Kohana::log("debug", "$module_name: module deleted"); + Kohana::log("debug", "$module_name: module deleted"); + } } /** -- cgit v1.2.3