aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_admin.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2005-12-10 23:20:21 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2005-12-10 23:20:21 +0000
commitb41525229be3e754f288e48e184626e53b211171 (patch)
treed82bc8a84467b59c584571a2d0db3c903d578a5e /phpBB/includes/functions_admin.php
parent85fdeda51cfcfb4b75923bbb339c02533e4b5a54 (diff)
downloadforums-b41525229be3e754f288e48e184626e53b211171.tar
forums-b41525229be3e754f288e48e184626e53b211171.tar.gz
forums-b41525229be3e754f288e48e184626e53b211171.tar.bz2
forums-b41525229be3e754f288e48e184626e53b211171.tar.xz
forums-b41525229be3e754f288e48e184626e53b211171.zip
- custom profile fields
- prune users - prune forums git-svn-id: file:///svn/phpbb/trunk@5325 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_admin.php')
-rw-r--r--phpBB/includes/functions_admin.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index cc39ecbdda..967f76d40e 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1501,6 +1501,7 @@ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync
{
$sql_and .= ' AND topic_type <> ' . POST_ANNOUNCE;
}
+
if (!($prune_flags & 8))
{
$sql_and .= ' AND topic_type <> ' . POST_STICKY;
@@ -1510,6 +1511,7 @@ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync
{
$sql_and .= " AND topic_last_post_time < $prune_date";
}
+
if ($prune_mode == 'viewed')
{
$sql_and .= " AND topic_last_view_time < $prune_date";