summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-11-13 13:56:05 -0800
committerTim Almdal <tnalmdal@shaw.ca>2009-11-13 13:56:05 -0800
commit0fe32a61f6c55e1302e45358375bf69a161ccdd4 (patch)
tree96bed6d9a9aac02d700acb1e8932cfdaaf147718 /modules/gallery/controllers
parentdef88149ccf8b542b376b96dd25c52f2ec6920e1 (diff)
Standardize the name of the blocks.
Diffstat (limited to 'modules/gallery/controllers')
-rw-r--r--modules/gallery/controllers/admin_sidebar.php4
-rw-r--r--modules/gallery/controllers/packager.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/gallery/controllers/admin_sidebar.php b/modules/gallery/controllers/admin_sidebar.php
index 6c8d15f1..77e83bc2 100644
--- a/modules/gallery/controllers/admin_sidebar.php
+++ b/modules/gallery/controllers/admin_sidebar.php
@@ -37,7 +37,7 @@ class Admin_Sidebar_Controller extends Admin_Controller {
foreach ($this->input->get("block", array()) as $block_id) {
$active_blocks[md5($block_id)] = explode(":", (string) $block_id);
}
- block_manager::set_active("site.sidebar", $active_blocks);
+ block_manager::set_active("site_sidebar", $active_blocks);
$result = array("result" => "success");
list($available, $active) = $this->_get_blocks();
@@ -55,7 +55,7 @@ class Admin_Sidebar_Controller extends Admin_Controller {
private function _get_blocks() {
$active_blocks = array();
$available_blocks = block_manager::get_available_site_blocks();
- foreach (block_manager::get_active("site.sidebar") as $block) {
+ foreach (block_manager::get_active("site_sidebar") as $block) {
$id = "{$block[0]}:{$block[1]}";
if (!empty($available_blocks[$id])) {
$active_blocks[$id] = $available_blocks[$id];
diff --git a/modules/gallery/controllers/packager.php b/modules/gallery/controllers/packager.php
index b2550603..82c3c938 100644
--- a/modules/gallery/controllers/packager.php
+++ b/modules/gallery/controllers/packager.php
@@ -76,7 +76,7 @@ class Packager_Controller extends Controller {
// We now have a clean install with just the packages that we want. Make sure that the
// database is clean too.
$i = 1;
- foreach (array("dashboard_sidebar", "dashboard_center", "site.sidebar") as $key) {
+ foreach (array("dashboard_sidebar", "dashboard_center", "site_sidebar") as $key) {
$blocks = array();
foreach (unserialize(module::get_var("gallery", "blocks_{$key}")) as $rnd => $value) {
$blocks[++$i] = $value;