From 39a40e49a19f00baeeeefe375d67e915ccc7e09a Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 29 Sep 2009 14:35:15 -0700
Subject: Refactor sidebar_blocks into a separate function and then call
 block_manager::get_html(site.sidebar). Convert image_block to use block
 management instead of theme::sidebar_blocks

---
 .../image_block/helpers/image_block_installer.php  | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 modules/image_block/helpers/image_block_installer.php

(limited to 'modules/image_block/helpers/image_block_installer.php')

diff --git a/modules/image_block/helpers/image_block_installer.php b/modules/image_block/helpers/image_block_installer.php
new file mode 100644
index 00000000..06668dc2
--- /dev/null
+++ b/modules/image_block/helpers/image_block_installer.php
@@ -0,0 +1,32 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class image_block_installer {
+  static function install() {
+    block_manager::add("site.sidebar", "image_block", "random_image");
+    module::set_version("image_block", 2);
+  }
+
+  static function upgrade($version) {
+    if ($version == 1) {
+      block_manager::add("site.sidebar", "image_block", "random_image");
+      module::set_version("image_block", 2);
+    }
+  }
+}
-- 
cgit v1.2.3


From 64f5a98bd60410e54b6d0c59c713bb7e3eff0a83 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 9 Nov 2009 07:34:30 -0800
Subject: Since the activate_sidebar_blocks mentod is called from the
 module::install, we don't need to add the block in the
 image_block_installer::install method as well> Fixes ticket 874.

---
 modules/image_block/helpers/image_block_installer.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'modules/image_block/helpers/image_block_installer.php')

diff --git a/modules/image_block/helpers/image_block_installer.php b/modules/image_block/helpers/image_block_installer.php
index 06668dc2..04a15619 100644
--- a/modules/image_block/helpers/image_block_installer.php
+++ b/modules/image_block/helpers/image_block_installer.php
@@ -19,13 +19,11 @@
  */
 class image_block_installer {
   static function install() {
-    block_manager::add("site.sidebar", "image_block", "random_image");
     module::set_version("image_block", 2);
   }
 
   static function upgrade($version) {
     if ($version == 1) {
-      block_manager::add("site.sidebar", "image_block", "random_image");
       module::set_version("image_block", 2);
     }
   }
-- 
cgit v1.2.3