diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-31 20:05:03 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-31 20:05:03 +0100 |
| commit | 89a34ff033b4b2cc854c79556bb75cd235c86509 (patch) | |
| tree | a06bdb0c3a6d8b612d6374d3e095283cebf8dbc4 | |
| parent | 3c4f1508590abb2ff6c4b86c9060f3da106ae2a5 (diff) | |
| parent | 68abcb9058e2eed57e2129192b5cf41fdc80f4bc (diff) | |
| download | forums-89a34ff033b4b2cc854c79556bb75cd235c86509.tar forums-89a34ff033b4b2cc854c79556bb75cd235c86509.tar.gz forums-89a34ff033b4b2cc854c79556bb75cd235c86509.tar.bz2 forums-89a34ff033b4b2cc854c79556bb75cd235c86509.tar.xz forums-89a34ff033b4b2cc854c79556bb75cd235c86509.zip | |
Merge pull request #4150 from rxu/ticket/14439
[ticket/14439] Do not call avatar manager if avatars are disabled
| -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 4c94b99b0d..d7cdd8030a 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1899,8 +1899,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); |