Bump the organize module to version 3 and get rid of the code that

makes sure that it depends on the REST module.

4 files changed, 3 insertions, 70 deletions

diff --git a/installer/install.sql b/installer/install.sql
index c1d71dc2..09fabc7d 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -247,7 +247,7 @@ CREATE TABLE {modules} (
 INSERT INTO {modules} VALUES (1,1,'gallery',43,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',2,4);
+INSERT INTO {modules} VALUES (4,1,'organize',1,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_event.php b/modules/organize/helpers/organize_event.php
index d6d21fc1..58daf180 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -51,22 +51,4 @@ class organize_event_Core {
       }
     }
   }
-
-  static function pre_deactivate($data) {
-    if ($data->module == "rest") {
-      $data->messages["warn"][] = t("The Organize module requires the Rest module.");
-    }
-  }
-
-  static function module_change($changes) {
-    if (!module::is_active("rest") || in_array("rest", $changes->deactivate)) {
-      site_status::warning(
-        t("The Organize module requires the Rest module.  <a href=\"%url\">Activate the Rest module now</a>",
-          array("url" => html::mark_clean(url::site("admin/modules")))),
-        "organize_needs_rest");
-    } else {
-      site_status::clear("organize_needs_rest");
-    }
-  }
-
 }
diff --git a/modules/organize/helpers/organize_installer.php b/modules/organize/helpers/organize_installer.php
deleted file mode 100644
index 2faa598b..00000000
--- a/modules/organize/helpers/organize_installer.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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 deactivate() {
-    site_status::clear("organize_needs_rest");
-  }
-
-  static function install() {
-    module::set_version("organize", $version = 2);
-  }
-
-  static function upgrade($version) {
-    if ($version == 1) {
-      if (!module::is_active("rest")) {
-        site_status::warning(
-          t("The Organize module requires the Rest module.  <a href=\"%url\">Activate the Rest module now</a>",
-            array("url" => html::mark_clean(url::site("admin/modules")))),
-          "organize_needs_rest");
-      }
-
-      module::set_version("organize", $version = 2);
-    }
-  }
-
-  static function can_activate() {
-    $messages = array();
-    if (!module::is_active("rest")) {
-      $messages["warn"][] = t("The Organize module requires the Rest module.");
-    }
-    return $messages;
-  }
-}
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