Fix for ticket #1320. Hook the loading of the initial albums and check to see if the loaded item is the requested item.

2 files changed, 2 insertions, 4 deletions

diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index 1593d30e..2f997600 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -61,8 +61,7 @@ class organize_event_Core {
   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>",
+        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 {
diff --git a/modules/organize/helpers/organize_installer.php b/modules/organize/helpers/organize_installer.php
index 12d8147f..2faa598b 100644
--- a/modules/organize/helpers/organize_installer.php
+++ b/modules/organize/helpers/organize_installer.php
@@ -30,8 +30,7 @@ class organize_installer {
     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>",
+          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");
       }