Oops! Proper fix for #1201. My last fix just redirected back to the

main site, and didn't actually log you out.

1 files changed, 4 insertions, 5 deletions

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index bdcfc67a..e3fa5e08 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -193,7 +193,9 @@ class gallery_event_Core {
                       ->url(user_profile::url($user->id))
                       ->label($user->display_name()));
 
-        if (isset($theme->item)) {
+        if (Router::$controller == "admin") {
+          $continue_url = url::site("");
+        } else if (isset($theme->item)) {
           if (access::user_can(identity::guest(), "view", $theme->item)) {
             $continue_url = $theme->item->abs_url();
           } else {
@@ -206,10 +208,7 @@ class gallery_event_Core {
         $menu->append(Menu::factory("link")
                       ->id("user_menu_logout")
                       ->css_id("g-logout-link")
-                      ->url(
-                        Router::$controller == "admin" ?
-                        url::site("") :
-                        url::site("logout?csrf=$csrf&continue_url=" . urlencode($continue_url)))
+                      ->url(url::site("logout?csrf=$csrf&continue_url=" . urlencode($continue_url)))
                       ->label(t("Logout")));
       }
     }