diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index d6e06902d3..d25d24d5ac 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -37,7 +37,7 @@
| action->objectTypes, $action->objectType, '');?> |
objectID;?> |
- createLink($module, 'view', "id=$action->objectID"), $action->objectName);?> |
+ createLink($module, 'view', $action->objectType == 'user' ? "account={$action->objectName}" : "id={$action->objectID}"), $action->objectName);?> |
actor];?> |
date;?> |
diff --git a/module/user/model.php b/module/user/model.php
index 4c474010f6..1460221c8f 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -42,6 +42,8 @@ class userModel extends model
*/
public function setUserList($users, $account)
{
+ $user = $this->getById($account);
+ if($user->deleted) $users[$account] = zget($user, 'realname', $account);
return html::select('account', $users, $account, "onchange=\"switchAccount(this.value, '{$this->app->getMethodName()}')\" class='form-control chosen'");
}
|