diff options
| author | rxu <rxu@mail.ru> | 2016-01-31 23:45:24 +0700 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2016-01-31 23:45:24 +0700 |
| commit | 68abcb9058e2eed57e2129192b5cf41fdc80f4bc (patch) | |
| tree | a06bdb0c3a6d8b612d6374d3e095283cebf8dbc4 | |
| parent | 3c4f1508590abb2ff6c4b86c9060f3da106ae2a5 (diff) | |
| download | forums-68abcb9058e2eed57e2129192b5cf41fdc80f4bc.tar forums-68abcb9058e2eed57e2129192b5cf41fdc80f4bc.tar.gz forums-68abcb9058e2eed57e2129192b5cf41fdc80f4bc.tar.bz2 forums-68abcb9058e2eed57e2129192b5cf41fdc80f4bc.tar.xz forums-68abcb9058e2eed57e2129192b5cf41fdc80f4bc.zip | |
[ticket/14439] Do not call avatar manager if avatars are disabled
PHPBB3-14439
| -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); |