diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-11 20:57:00 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-11 20:57:00 +0200 |
| commit | 69eb563e1821d8c27f5beae2adc0abeed61ffec2 (patch) | |
| tree | f32f1a43bbc3c60b36c9cc94b71f6d29a12a7b75 /phpBB/includes | |
| parent | 832c9f64e04ad22dce1d51e72f3c65df4894c0eb (diff) | |
| parent | 2c65b9b133ffc3ee958ce9d5a579f7d58741292d (diff) | |
| download | forums-69eb563e1821d8c27f5beae2adc0abeed61ffec2.tar forums-69eb563e1821d8c27f5beae2adc0abeed61ffec2.tar.gz forums-69eb563e1821d8c27f5beae2adc0abeed61ffec2.tar.bz2 forums-69eb563e1821d8c27f5beae2adc0abeed61ffec2.tar.xz forums-69eb563e1821d8c27f5beae2adc0abeed61ffec2.zip | |
Merge branch 'prep-release-3.1.5' into 3.1.x
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_prune.php | 10 | ||||
| -rw-r--r-- | phpBB/includes/constants.php | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php index c68f26fc13..e17399e3d9 100644 --- a/phpBB/includes/acp/acp_prune.php +++ b/phpBB/includes/acp/acp_prune.php @@ -506,9 +506,9 @@ class acp_prune WHERE ug.group_id = ' . (int) $group_id . ' AND ug.user_id <> ' . ANONYMOUS . ' AND u.user_type <> ' . USER_FOUNDER . ' - AND ug.user_pending = 0 ' . - (!empty($user_ids) ? ' AND ' . $db->sql_in_set('ug.user_id', $user_ids) : '') . ' - AND u.user_id = ug.user_id'; + AND ug.user_pending = 0 + AND u.user_id = ug.user_id + ' . (!empty($user_ids) ? ' AND ' . $db->sql_in_set('ug.user_id', $user_ids) : ''); $result = $db->sql_query($sql); // we're performing an intersection operation, so all the relevant users @@ -532,10 +532,10 @@ class acp_prune $sql = 'SELECT u.user_id, u.username, COUNT(p.post_id) AS queue_posts FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u WHERE u.user_id <> ' . ANONYMOUS . ' - AND u.user_type <> ' . USER_FOUNDER . - (!empty($user_ids) ? ' AND ' . $db->sql_in_set('p.poster_id', $user_ids) : '') . ' + AND u.user_type <> ' . USER_FOUNDER . ' AND ' . $db->sql_in_set('p.post_visibility', array(ITEM_UNAPPROVED, ITEM_REAPPROVE)) . ' AND u.user_id = p.poster_id + ' . (!empty($user_ids) ? ' AND ' . $db->sql_in_set('p.poster_id', $user_ids) : '') . ' GROUP BY p.poster_id HAVING queue_posts ' . $key_match[$queue_select] . ' ' . $posts_on_queue; $result = $db->sql_query($sql); diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index c53d976615..3e44125204 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.1.5-dev'); +define('PHPBB_VERSION', '3.1.5-RC1'); // QA-related // define('PHPBB_QA', 1); |