Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 18 insertions, 0 deletions

diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index a9d64637..ae05fb5d 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -42,4 +42,22 @@ 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");
+    }
+  }
+
 }