Merge branch 'master' into talmdal_dev

1 files changed, 2 insertions, 1 deletions

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 301432d4..0303c9cb 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -109,6 +109,7 @@ class gallery_event_Core {
                       ->label(t("Login")));
       } else {
         $csrf = access::csrf_token();
+        $item = $theme->item();
         $menu->append(Menu::factory("dialog")
                       ->id("user_menu_edit_profile")
                       ->css_id("g-user-profile-link")
@@ -119,7 +120,7 @@ class gallery_event_Core {
                     ->id("user_menu_logout")
                     ->css_id("g-logout-link")
                     ->url(url::site("logout?csrf=$csrf&continue=" .
-                                    urlencode(url::current(true))))
+                                    urlencode($item->url())))
                     ->label(t("Logout")));
       }
     }