diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-03 14:29:22 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-03 14:29:22 +0000 |
| commit | f7b51337c55f88f19f8b9406b64e7d03150efa2c (patch) | |
| tree | 3b2482e66108730672abc059963c6b0b3caec061 /phpBB/includes/acp/acp_users.php | |
| parent | 58ac5df6b376ef57c333565b94698c41b02e67cf (diff) | |
| download | forums-f7b51337c55f88f19f8b9406b64e7d03150efa2c.tar forums-f7b51337c55f88f19f8b9406b64e7d03150efa2c.tar.gz forums-f7b51337c55f88f19f8b9406b64e7d03150efa2c.tar.bz2 forums-f7b51337c55f88f19f8b9406b64e7d03150efa2c.tar.xz forums-f7b51337c55f88f19f8b9406b64e7d03150efa2c.zip | |
some language-specific adjustements
fix prune users (adding the list of users to the confirmation page)
tried to fix the show/hide trigger in ACP by not using width: auto; (which gets somehow inherited to each other element)
git-svn-id: file:///svn/phpbb/trunk@7455 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index c7df637fee..1e8a7b8f3e 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -252,9 +252,9 @@ class acp_users $ban_give_reason = request_var('ban_give_reason', '', true); // Log not used at the moment, we simply utilize the ban function. - user_ban(substr($action, 3), $ban, 0, 0, 0, $ban_reason, $ban_give_reason); + $result = user_ban(substr($action, 3), $ban, 0, 0, 0, $ban_reason, $ban_give_reason); - trigger_error($user->lang['BAN_SUCCESSFUL'] . adm_back_link($this->u_action . '&u=' . $user_id)); + trigger_error((($result === false) ? $user->lang['BAN_ALREADY_ENTERED'] : $user->lang['BAN_SUCCESSFUL']) . adm_back_link($this->u_action . '&u=' . $user_id)); break; @@ -1339,7 +1339,7 @@ class acp_users include($phpbb_root_path . 'includes/functions_display.' . $phpEx); - $can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && is_writeable($phpbb_root_path . $config['avatar_path']) && $file_uploads) ? true : false; + $can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && @is_writable($phpbb_root_path . $config['avatar_path']) && $file_uploads) ? true : false; if ($submit) { |