Merge branch 'sprint/168_sunhao/refactor_avatar_helper' into 'sprint/168'

* Refactor avatar helper, the $user param cannot be an avatar url now.

See merge request easycorp/zentaopms!161
This commit is contained in:
朱金勇
2021-10-27 03:01:59 +00:00
+1 -2
View File
@@ -229,7 +229,7 @@ class html extends baseHTML
/**
* Create user avatar.
*
* @param string|object|array $user User object or user avatar url or user account
* @param string|object|array $user User object or user account
* @param string|int $size Avatar size, can be a number or preset sizes: "xs", "sm", "", "lg", "xl", default is ""
* @param string $className Avatar element class name, default is "avatar-circle"
* @param string $attrib Extra attributes on avatar element
@@ -248,7 +248,6 @@ class html extends baseHTML
if(is_string($user))
{
$userObj->account = $user;
if(strlen($user) > 1) $userObj->avatar = $user;
$user = $userObj;
}
elseif(is_array($user))