Use $theme->item() instead of $theme->item, otherwise

isset($theme->item) may return true even when we don't have an actual Item_Model in there.
gallery · Sep 12, 2010 · bfd92ac · bfd92ac
1 parent c9c4f96
commit bfd92ac
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
@@ -209,11 +209,12 @@ static function user_menu($menu, $theme) {
                       ->url(user_profile::url($user->id))
                       ->label($user->display_name()));
 
+        $item = $theme->item();
         if (Router::$controller == "admin") {
           $continue_url = url::abs_site("");
-        } else if (isset($theme->item)) {
+        } else if ($item) {
           if (access::user_can(identity::guest(), "view", $theme->item)) {
-            $continue_url = $theme->item->abs_url();
+            $continue_url = $item->abs_url();
           } else {
             $continue_url = item::root()->abs_url();
           }