diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-02-09 14:24:34 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-02-09 14:24:34 +0000 |
| commit | 7216ffe8be85a58eedb4f1e7fe2278a89110be9d (patch) | |
| tree | 0991b1d26b268f0a97a54cdea6edad9c0708daab /phpBB/includes/acp/acp_prune.php | |
| parent | 56a93bdfdddde618fe826c23c9151086f9540860 (diff) | |
| download | forums-7216ffe8be85a58eedb4f1e7fe2278a89110be9d.tar forums-7216ffe8be85a58eedb4f1e7fe2278a89110be9d.tar.gz forums-7216ffe8be85a58eedb4f1e7fe2278a89110be9d.tar.bz2 forums-7216ffe8be85a58eedb4f1e7fe2278a89110be9d.tar.xz forums-7216ffe8be85a58eedb4f1e7fe2278a89110be9d.zip | |
some fixes to be committed.
git-svn-id: file:///svn/phpbb/trunk@6975 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_prune.php')
| -rw-r--r-- | phpBB/includes/acp/acp_prune.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php index 851671e36d..9e680e4714 100644 --- a/phpBB/includes/acp/acp_prune.php +++ b/phpBB/includes/acp/acp_prune.php @@ -219,6 +219,11 @@ class acp_prune $active = ($active) ? explode('-', $active) : array(); $joined = ($joined) ? explode('-', $joined) : array(); + if ((sizeof($active) && sizeof($active) != 3) || (sizeof($joined) && sizeof($joined) != 3)) + { + trigger_error($user->lang['WRONG_ACTIVE_JOINED_DATE'] . adm_back_link($this->u_action), E_USER_WARNING); + } + $count = request_var('count', 0); $key_match = array('lt' => '<', 'gt' => '>', 'eq' => '='); @@ -257,7 +262,8 @@ class acp_prune while ($row = $db->sql_fetchrow($result)) { - if (!in_array($row['user_id'], $bot_ids)) + // Do not prune bots and the user currently pruning. + if ($row['user_id'] != $user->data['user_id'] && !in_array($row['user_id'], $bot_ids)) { $user_ids[] = $row['user_id']; $usernames[$row['user_id']] = $row['username']; |