diff --git a/module/action/model.php b/module/action/model.php index 4b2a48b6a9..b14624c43b 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1034,13 +1034,13 @@ class actionModel extends model $action->objectName .= $this->lang->action->label->startProgram; } - if($action->objectType == 'branch' and $action->action == 'mergedbranch') + elseif($action->objectType == 'branch' and $action->action == 'mergedbranch') { if($action->objectID == 0) $action->objectName = $this->lang->branch->main; $action->objectName = '"' . $action->extra . ' "' . $this->lang->action->to . ' "' . $action->objectName . '"'; } - if($action->objectType == 'user') - { + elseif($action->objectType == 'user') + ({ $user = $this->dao->select('id,realname')->from(TABLE_USER)->where('id')->eq($action->objectID)->fetch(); if($user) $action->objectName = $user->realname; }