diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-30 07:48:19 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-30 07:48:19 -0700 |
| commit | 612bc3f0913f7f410f417ee02934491b9d2e410d (patch) | |
| tree | d2ad1a4009d545f3565c93f8c55a8fbf3092ed84 /modules | |
| parent | a2108787257739a83708ea5c3bc21bd11e6dad17 (diff) | |
| parent | 19cb27c9a4489c357c0e516c69ebcb218f8832c1 (diff) | |
Merge branch 'talmdal_dev' of git@github.com:gallery/gallery3 into talmdal_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
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/image_block/helpers/image_block_installer.php | 32 | ||||
| -rw-r--r-- | modules/image_block/module.info | 2 | ||||
| -rw-r--r-- | modules/info/module.info | 2 |
3 files changed, 34 insertions, 2 deletions
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); + } + } +} diff --git a/modules/image_block/module.info b/modules/image_block/module.info index e6d85048..b92b83df 100644 --- a/modules/image_block/module.info +++ b/modules/image_block/module.info @@ -1,3 +1,3 @@ name = "Image Block" description = "Display a random image in the sidebar" -version = 1 +version = 2 diff --git a/modules/info/module.info b/modules/info/module.info index e352213c..5f84cbb9 100644 --- a/modules/info/module.info +++ b/modules/info/module.info @@ -1,3 +1,3 @@ name = "Info" description = "Display extra information about photos and albums" -version = 1 +version = 2 |