diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-27 16:13:18 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-27 16:13:18 +0100 |
| commit | 621574011203c2ac2ada16d661347791a3443641 (patch) | |
| tree | 906654bd08492585eb79595c93c79bc6649d42e4 /phpBB/includes/functions.php | |
| parent | 791464258f167a5fa0802e759f0141b1c0d45e39 (diff) | |
| parent | ede3963951a9701478b0a84bcacded916a72ba7c (diff) | |
| download | forums-621574011203c2ac2ada16d661347791a3443641.tar forums-621574011203c2ac2ada16d661347791a3443641.tar.gz forums-621574011203c2ac2ada16d661347791a3443641.tar.bz2 forums-621574011203c2ac2ada16d661347791a3443641.tar.xz forums-621574011203c2ac2ada16d661347791a3443641.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10497] Fix SQL error when guest visits forum with unread topic
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 92273bf08c..9e2e57dd5e 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1717,11 +1717,11 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti } else { - $sql = 'SELECT topic_id - FROM ' . TOPICS_TABLE . ' - WHERE forum_id = ' . $forum_id . ' - AND topic_last_post_time > ' . $mark_time_forum . ' - AND topic_moved_id = 0 ' . + $sql = 'SELECT t.topic_id + FROM ' . TOPICS_TABLE . ' t + WHERE t.forum_id = ' . $forum_id . ' + AND t.topic_last_post_time > ' . $mark_time_forum . ' + AND t.topic_moved_id = 0 ' . $sql_update_unapproved; $result = $db->sql_query($sql); |