From 68abcb9058e2eed57e2129192b5cf41fdc80f4bc Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 31 Jan 2016 23:45:24 +0700
Subject: [PATCH] [ticket/14439] Do not call avatar manager if avatars are
 disabled

PHPBB3-14439
---
 phpBB/includes/acp/acp_users.php | 8 ++++++--
 1 file 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);