From 4fc5d50eb83f29c0a28ce16b9ff22179fd3f2c98 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 8 Jan 2011 12:59:12 -0800
Subject: Bump the organize module to version 3 and get rid of the code that
 makes sure that it depends on the REST module.

---
 modules/organize/module.info | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/organize/module.info')

diff --git a/modules/organize/module.info b/modules/organize/module.info
index d7199571..be0bc86d 100644
--- a/modules/organize/module.info
+++ b/modules/organize/module.info
@@ -1,3 +1,3 @@
 name = "Organize"
-description = "Organize your gallery by apply tags or moving images"
-version = 2
+description = "Visually rearrange and move photos in your gallery"
+version = 3
-- 
cgit v1.2.3


From f657a05d7ed21423afb925755bacbb07a1384044 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 18 Jan 2011 10:06:29 -0800
Subject: Get rid of the "organize needs rest" message when upgrading to the
 new organize; it may be hanging around from a prior version.  Reinstate the
 installer for this.  Bump organize module to v4.  Follow-on for #1584.

---
 installer/install.sql                           |  2 +-
 modules/organize/helpers/organize_installer.php | 28 +++++++++++++++++++++++++
 modules/organize/module.info                    |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 modules/organize/helpers/organize_installer.php

(limited to 'modules/organize/module.info')

diff --git a/installer/install.sql b/installer/install.sql
index 1d2e6720..865cb2a4 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -247,7 +247,7 @@ CREATE TABLE {modules} (
 INSERT INTO {modules} VALUES (1,1,'gallery',46,1);
 INSERT INTO {modules} VALUES (2,1,'user',3,2);
 INSERT INTO {modules} VALUES (3,1,'comment',3,3);
-INSERT INTO {modules} VALUES (4,1,'organize',3,4);
+INSERT INTO {modules} VALUES (4,1,'organize',4,4);
 INSERT INTO {modules} VALUES (5,1,'info',2,5);
 INSERT INTO {modules} VALUES (6,1,'rss',1,6);
 INSERT INTO {modules} VALUES (7,1,'search',1,7);
diff --git a/modules/organize/helpers/organize_installer.php b/modules/organize/helpers/organize_installer.php
new file mode 100644
index 00000000..d68bc3b6
--- /dev/null
+++ b/modules/organize/helpers/organize_installer.php
@@ -0,0 +1,28 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 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 organize_installer {
+  static function upgrade($version) {
+    if ($version < 4) {
+      // No longer necessary, make sure that it's cleared.
+      site_status::clear("organize_needs_rest");
+      module::set_version("organize", $version = 4);
+    }
+  }
+}
diff --git a/modules/organize/module.info b/modules/organize/module.info
index be0bc86d..0d16144d 100644
--- a/modules/organize/module.info
+++ b/modules/organize/module.info
@@ -1,3 +1,3 @@
 name = "Organize"
 description = "Visually rearrange and move photos in your gallery"
-version = 3
+version = 4
-- 
cgit v1.2.3