From b088de063150e7d2f984c0db7148cfe54777f421 Mon Sep 17 00:00:00 2001 From: Deon George Date: Mon, 11 Jan 2016 10:09:38 +1100 Subject: [PATCH] Added test for Account Object --- application/classes/Menu.php | 9 +++++---- application/classes/URL.php | 4 +++- application/views/theme/baseadmin/page.php | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/application/classes/Menu.php b/application/classes/Menu.php index 3dcf722a..3d48742e 100644 --- a/application/classes/Menu.php +++ b/application/classes/Menu.php @@ -38,10 +38,11 @@ class Menu extends lnApp_Menu { $ao = Auth::instance()->get_user(); - foreach ($ao->methods() as $mmo) - if ($mmo->menu_display AND $type == $mmo->directory()) - if (empty($result[$mmo->id])) - $result[$mmo->id] = $mmo; + if (is_object($ao)) + foreach ($ao->methods() as $mmo) + if ($mmo->menu_display AND $type == $mmo->directory()) + if (empty($result[$mmo->id])) + $result[$mmo->id] = $mmo; return self::collapse($result); } diff --git a/application/classes/URL.php b/application/classes/URL.php index b469dcf3..431c101b 100644 --- a/application/classes/URL.php +++ b/application/classes/URL.php @@ -30,7 +30,9 @@ class URL extends lnApp_URL { case 'reseller': $result[$k] = array('name'=>'Reseller','icon'=>'icon-th-list'); break; - case 'user': $result[$k] = array('name'=>Auth::instance()->get_user()->name(),'icon'=>'icon-user'); + case 'user': + if (is_object(Auth::instance()->get_user())) + $result[$k] = array('name'=>Auth::instance()->get_user()->name(),'icon'=>'icon-user'); break; default: $result[$k] = array('name'=>$k,'icon'=>'icon-question-sign'); diff --git a/application/views/theme/baseadmin/page.php b/application/views/theme/baseadmin/page.php index 41ad8b12..0d4f4da3 100644 --- a/application/views/theme/baseadmin/page.php +++ b/application/views/theme/baseadmin/page.php @@ -77,7 +77,7 @@
  • Admin
    • - isReseller()) : ?> + isReseller()) : ?>
  • Reseller