diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 20:10:17 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 20:10:17 +0200 |
| commit | a2918fd98e61db0e7e9885fb546abc024c84d0fc (patch) | |
| tree | 9fa6b52d6bb55ec5256c67e821550e111ee50dbe /phpBB/includes/acp/acp_users.php | |
| parent | 31b221ae913c49fa2e2a776bd9fd54659728fcd0 (diff) | |
| parent | 6da582e8be50fa7211706625402215f6f87ed48b (diff) | |
| download | forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.tar forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.tar.gz forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.tar.bz2 forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.tar.xz forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9704] Fix minor typo in coding guidelines.
[ticket/9690] Add forthcoming Bing Bot to list of recognized bots
[ticket/9451] Add optional $can_upload parameter to avatar_process_user().
[ticket/9593] A readme file for unit tests and running unit tests.
[ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
[ticket/9589] Added sample nginx configuration file for phpbb.
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 7914edd056..3a405da825 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1706,7 +1706,7 @@ class acp_users trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); } - if (avatar_process_user($error, $user_row)) + if (avatar_process_user($error, $user_row, $can_upload)) { trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&u=' . $user_row['user_id'])); } |