Pulled latest source from upstream.

1 files changed, 24 insertions, 0 deletions

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 3f83b23d..ca8c92c9 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -37,6 +37,30 @@ class gallery_Core {
   }
 
   /**
+   * If the gallery is only available to registered users and the user is not logged in, present
+   * the login page.
+   */
+  static function private_gallery() {
+    if (Router::$controller != "login" &&
+        Router::$controller != "combined" &&
+        identity::active_user()->guest &&
+        !access::user_can(identity::guest(), "view", item::root()) &&
+        php_sapi_name() != "cli") {
+      if (Router::$controller == "admin") {
+        // At this point we're in the admin theme and it doesn't have a themed login page, so
+        // we can't just swap in the login controller and have it work.  So redirect back to the
+        // root item where we'll run this code again with the site theme.
+        url::redirect(item::root()->abs_url());
+      } else {
+        Session::instance()->set("continue_url", url::abs_current());
+        Router::$controller = "login";
+        Router::$controller_path = MODPATH . "gallery/controllers/login.php";
+        Router::$method = "html";
+      }
+    }
+  }
+
+  /**
    * This function is called when the Gallery is fully initialized.  We relay it to modules as the
    * "gallery_ready" event.  Any module that wants to perform an action at the start of every
    * request should implement the <module>_event::gallery_ready() handler.