diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-01-30 21:48:49 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-01-30 21:48:49 +0000 |
| commit | 48ed77f046f9f6bcdfb449f49698e9dac60787c8 (patch) | |
| tree | f340744a2a71bcd93f028e281b4924fb087aacc1 /phpBB/includes/functions_posting.php | |
| parent | 4b5fab372ff69a809144dee3a0a7f90c219fe400 (diff) | |
| download | forums-48ed77f046f9f6bcdfb449f49698e9dac60787c8.tar forums-48ed77f046f9f6bcdfb449f49698e9dac60787c8.tar.gz forums-48ed77f046f9f6bcdfb449f49698e9dac60787c8.tar.bz2 forums-48ed77f046f9f6bcdfb449f49698e9dac60787c8.tar.xz forums-48ed77f046f9f6bcdfb449f49698e9dac60787c8.zip | |
Merging revisions #r8352, #r8353, #r8354 and #r8355
git-svn-id: file:///svn/phpbb/trunk@8356 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index a93431b60e..2ff7c364f3 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -939,7 +939,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id WHERE p.topic_id = $topic_id " . ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND p.post_approved = 1' : '') . ' ' . (($mode == 'post_review') ? " AND p.post_id > $cur_post_id" : '') . ' - ORDER BY p.post_time'; + ORDER BY p.post_time '; $sql .= ($mode == 'post_review') ? 'ASC' : 'DESC'; $result = $db->sql_query_limit($sql, $config['posts_per_page']); @@ -1111,7 +1111,7 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id trigger_error('WRONG_NOTIFICATION_MODE'); } - if (!$config['allow_topic_notify']) + if (($topic_notification && !$config['allow_topic_notify']) || ($forum_notification && !$config['allow_forum_notify'])) { return; } |