From 53b2f5903dd2c156b497a36872dfdda2e1b9577a Mon Sep 17 00:00:00 2001 From: Vaidas Lungis Date: Thu, 8 Jan 2015 11:00:56 +0200 Subject: [PATCH] do not call DI objects loggedin_admin | loggedin_client if it aren't logged in Later calls to DI objects loggedin_admin | loggedin_client are incorrect if exception was thrown. object has value of Closure{} --- src/bb-di.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/bb-di.php b/src/bb-di.php index 5d6f97d43..5fcc64acc 100644 --- a/src/bb-di.php +++ b/src/bb-di.php @@ -26,15 +26,13 @@ $di['logger'] = function () use ($di) { if ($log_to_db) { $activity_service = $di['mod_service']('activity'); $writer2 = new Box_LogDb($activity_service); - try { - $admin = $di['loggedin_admin']; - $log->setEventItem('admin_id', $admin->id); - } catch (Exception $e) { - try { - $client = $di['loggedin_client']; - $log->setEventItem('client_id', $client->id); - } catch (Exception $e) { - } + if ($di['auth']->isAdminLoggedIn()){ + $admin = $di['loggedin_admin']; + $log->setEventItem('admin_id', $admin->id); + } + elseif ($di['auth']->isClientLoggedIn()) { + $client = $di['loggedin_client']; + $log->setEventItem('client_id', $client->id); } $log->addWriter($writer2); }