mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Conflicts:
	phpBB/phpbb/user_loader.php
This commit is contained in:
Marc Alexander
2015-06-16 12:35:51 +02:00
parent d5414592f1 dc9245dd7a
commit 80768b526b
13 changed files with 54 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/notification/type/admin_activate_user.php
View File

@@ -104,7 +104,7 @@ class admin_activate_user extends \phpbb\notification\type\base
*/
public function get_avatar()
{
return $this->user_loader->get_avatar($this->item_id);
return $this->user_loader->get_avatar($this->item_id, false, true);
}
/**

2
phpBB/phpbb/notification/type/group_request.php
View File

@@ -96,7 +96,7 @@ class group_request extends \phpbb\notification\type\base
*/
public function get_avatar()
{
return $this->user_loader->get_avatar($this->item_id);
return $this->user_loader->get_avatar($this->item_id, false, true);
}
/**

2
phpBB/phpbb/notification/type/pm.php
View File

@@ -100,7 +100,7 @@ class pm extends \phpbb\notification\type\base
*/
public function get_avatar()
{
return $this->user_loader->get_avatar($this->get_data('from_user_id'));
return $this->user_loader->get_avatar($this->get_data('from_user_id'), false, true);
}
/**

2
phpBB/phpbb/notification/type/post.php
View File

@@ -165,7 +165,7 @@ class post extends \phpbb\notification\type\base
*/
public function get_avatar()
{
return $this->user_loader->get_avatar($this->get_data('poster_id'));
return $this->user_loader->get_avatar($this->get_data('poster_id'), false, true);
}
/**

2
phpBB/phpbb/notification/type/report_pm.php
View File

@@ -223,7 +223,7 @@ class report_pm extends \phpbb\notification\type\pm
*/
public function get_avatar()
{
return $this->user_loader->get_avatar($this->get_data('reporter_id'));
return $this->user_loader->get_avatar($this->get_data('reporter_id'), false, true);
}
/**

2
phpBB/phpbb/notification/type/report_pm_closed.php
View File

@@ -130,7 +130,7 @@ class report_pm_closed extends \phpbb\notification\type\pm
*/
public function get_avatar()
{
return $this->user_loader->get_avatar($this->get_data('closer_id'));
return $this->user_loader->get_avatar($this->get_data('closer_id'), false, true);
}
/**

2
phpBB/phpbb/notification/type/report_post.php
View File

@@ -196,7 +196,7 @@ class report_post extends \phpbb\notification\type\post_in_queue
*/
public function get_avatar()
{
return $this->user_loader->get_avatar($this->get_data('reporter_id'));
return $this->user_loader->get_avatar($this->get_data('reporter_id'), false, true);
}
/**

2
phpBB/phpbb/notification/type/report_post_closed.php
View File

@@ -137,7 +137,7 @@ class report_post_closed extends \phpbb\notification\type\post
*/
public function get_avatar()
{
return $this->user_loader->get_avatar($this->get_data('closer_id'));
return $this->user_loader->get_avatar($this->get_data('closer_id'), false, true);
}
/**

2
phpBB/phpbb/notification/type/topic.php
View File

@@ -119,7 +119,7 @@ class topic extends \phpbb\notification\type\base
*/
public function get_avatar()
{
return $this->user_loader->get_avatar($this->get_data('poster_id'));
return $this->user_loader->get_avatar($this->get_data('poster_id'), false, true);
}
/**

5
phpBB/phpbb/user_loader.php
View File

@@ -179,9 +179,10 @@ class user_loader
* @param bool $query Should we query the database if this user has not yet been loaded?
* Typically this should be left as false and you should make sure
* you load users ahead of time with load_users()
* @param bool @lazy If true, will be lazy loaded (requires JS)
* @return string
*/
public function get_avatar($user_id, $query = false)
public function get_avatar($user_id, $query = false, $lazy = false)
{
if (!($user = $this->get_user($user_id, $query)))
{
@@ -195,7 +196,7 @@ class user_loader
'avatar_height' => $user['user_avatar_height'],
);
return phpbb_get_avatar($row, 'USER_AVATAR');
return phpbb_get_avatar($row, 'USER_AVATAR', false, $lazy);
}
/**