summaryrefslogtreecommitdiff
path: root/modules/gallery/helpers/module.php
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-11-12 09:29:17 -0800
committerTim Almdal <tnalmdal@shaw.ca>2009-11-12 13:13:34 -0800
commit79f700ef9f79926d5e806bd48e5a6f99b6ecc5bb (patch)
tree53c7100e69da76a31e9ac8519f5ea5bc55488921 /modules/gallery/helpers/module.php
parent3d8d2f71be68ce5bb267a54a36d6ab495c22e6b1 (diff)
Change the keys of the block arrays in block manager to be a md5 hash of module_name:block_id. This allows easier lookup of blocks to remove when modules
are being deactivated. Change the module activation/deactivation to call (activate|deactivate)_blocks instead of just the sidebar blocks. This insures that when a module is deactivated any admin dashboard blocks are removed as well the site sideboard blocks. Fix for ticket #876.
Diffstat (limited to 'modules/gallery/helpers/module.php')
-rw-r--r--modules/gallery/helpers/module.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index da334370..e6c196ce 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -211,7 +211,7 @@ class module_Core {
graphics::activate_rules($module_name);
- block_manager::activate_sidebar_blocks($module_name);
+ block_manager::activate_blocks($module_name);
log::success(
"module", t("Activated module %module_name", array("module_name" => $module_name)));
@@ -238,7 +238,7 @@ class module_Core {
graphics::deactivate_rules($module_name);
- block_manager::deactivate_sidebar_blocks($module_name);
+ block_manager::deactivate_blocks($module_name);
log::success(
"module", t("Deactivated module %module_name", array("module_name" => $module_name)));