diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 19:52:29 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 19:52:29 +0200 |
| commit | c3db21bfa2a01a3de6fd520f99b0399d8cdf5748 (patch) | |
| tree | 9f8dd32b7ea90e365f0c62731258fceb4768f0e3 /phpBB/includes/acp | |
| parent | f92c96d424a764b31ccbadc8fc2eafab594a04a3 (diff) | |
| parent | e130a6bad94f534b3e573efcdb2b94332426598e (diff) | |
| download | forums-c3db21bfa2a01a3de6fd520f99b0399d8cdf5748.tar forums-c3db21bfa2a01a3de6fd520f99b0399d8cdf5748.tar.gz forums-c3db21bfa2a01a3de6fd520f99b0399d8cdf5748.tar.bz2 forums-c3db21bfa2a01a3de6fd520f99b0399d8cdf5748.tar.xz forums-c3db21bfa2a01a3de6fd520f99b0399d8cdf5748.zip | |
Merge branch 'ticket/bantu/9451' into develop-olympus
* ticket/bantu/9451:
[ticket/9451] Add optional $can_upload parameter to avatar_process_user().
Diffstat (limited to 'phpBB/includes/acp')
| -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'])); } |