Merge branch 'master' into talmdal_dev

gallery · Dec 30, 2009 · 2e98825 · 2e98825
2 parents 7e8985d + 373dcf0
commit 2e98825
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
@@ -109,6 +109,7 @@ static function user_menu($menu, $theme) {
                       ->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 @@ static function user_menu($menu, $theme) {
                     ->id("user_menu_logout")
                     ->css_id("g-logout-link")
                     ->url(url::site("logout?csrf=$csrf&amp;continue=" .
-                                    urlencode(url::current(true))))
+                                    urlencode($item->url())))
                     ->label(t("Logout")));
       }
     }