Skip to content

ログインしている自分のアバター表示に対応 #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 14, 2016
Merged

ログインしている自分のアバター表示に対応 #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions View/Helper/DisplayUserHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,12 @@ public function handle($user, $attributes = array(), $model = 'TrackableCreator'
*
* @param array $user ユーザデータ
* @param array $attributes imgタグの属性
* @param array $model モデル名(TrackableCreatorやTrackableUpdaterなど)
* @param string $modelId モデル名+id(TrackableCreator.idやTrackableUpdater.idなど)
* @param bool $asImageTag imgタグとするかのフラグ
* @return string HTMLタグ
* @SuppressWarnings(PHPMD.BooleanArgumentFlag)
*/
public function avatar($user, $attributes = array(), $model = 'TrackableCreator', $asImageTag = true) {
public function avatar($user, $attributes = array(), $modelId = 'TrackableCreator.id', $asImageTag = true) {
$html = '';

//if (Hash::check($user, 'UploadFile.' . UserAttribute::AVATAR_FIELD . '.field_name')) {
Expand All @@ -118,7 +118,7 @@ public function avatar($user, $attributes = array(), $model = 'TrackableCreator'
'plugin' => 'users',
'controller' => 'users',
'action' => 'download',
'key' => Hash::get($user, $model . '.id'),
'key' => Hash::get($user, $modelId),
UserAttribute::AVATAR_FIELD,
'thumb'
));
Expand Down