Permalink
Browse files

Merge branch 'talmdal_dev' of git@github.com:gallery/gallery3 into ta…

…lmdal_dev

Conflicts:
	modules/gallery/helpers/block_manager.php
	modules/gallery/libraries/Theme_View.php
	modules/image_block/helpers/image_block_block.php
	modules/image_block/helpers/image_block_theme.php
	modules/info/helpers/info_block.php
	modules/info/helpers/info_installer.php
  • Loading branch information...
2 parents a210878 + 19cb27c commit 612bc3f0913f7f410f417ee02934491b9d2e410d @talmdal talmdal committed Sep 30, 2009
@@ -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);
+ }
+ }
+}
@@ -1,3 +1,3 @@
name = "Image Block"
description = "Display a random image in the sidebar"
-version = 1
+version = 2
View
@@ -1,3 +1,3 @@
name = "Info"
description = "Display extra information about photos and albums"
-version = 1
+version = 2

0 comments on commit 612bc3f

Please sign in to comment.