diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-31 20:05:07 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-31 20:05:07 +0100 |
| commit | 0d93af8324aeb99427372284c5cf4e3860d3b93c (patch) | |
| tree | 1ab566825233224dc5dbfefc8b80f093e72b41e5 /phpBB/includes | |
| parent | 3a4dae369ddfc85952591f4672be388cd7a85efb (diff) | |
| parent | 89a34ff033b4b2cc854c79556bb75cd235c86509 (diff) | |
| download | forums-0d93af8324aeb99427372284c5cf4e3860d3b93c.tar forums-0d93af8324aeb99427372284c5cf4e3860d3b93c.tar.gz forums-0d93af8324aeb99427372284c5cf4e3860d3b93c.tar.bz2 forums-0d93af8324aeb99427372284c5cf4e3860d3b93c.tar.xz forums-0d93af8324aeb99427372284c5cf4e3860d3b93c.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 2bec4385c3..0ee6452ada 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1929,8 +1929,12 @@ class acp_users } } - // Replace "error" strings with their real, localised form - $error = $phpbb_avatar_manager->localize_errors($user, $error); + // Avatar manager is not initialized if avatars are disabled + if (isset($phpbb_avatar_manager)) + { + // Replace "error" strings with their real, localised form + $error = $phpbb_avatar_manager->localize_errors($user, $error); + } $avatar = phpbb_get_user_avatar($user_row, 'USER_AVATAR', true); |