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{}
This commit is contained in:
Vaidas Lungis committed 2015-01-08 11:00:56 +02:00
1 parent ca61b5aeb4
commit 53b2f5903d
1 file changed
+7 -9
+7 -9
View File
@@ -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);
}