diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-27 16:13:11 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-27 16:13:11 +0100 |
| commit | ede3963951a9701478b0a84bcacded916a72ba7c (patch) | |
| tree | 034f9005ad2ebaa56a06b6fffe37e84d9073952f /phpBB/includes | |
| parent | 7520b2763973b7ca892bd8339acb98c894b57a1c (diff) | |
| parent | b89320ad392628a093b351ac8bdd79b8e58f22aa (diff) | |
| download | forums-ede3963951a9701478b0a84bcacded916a72ba7c.tar forums-ede3963951a9701478b0a84bcacded916a72ba7c.tar.gz forums-ede3963951a9701478b0a84bcacded916a72ba7c.tar.bz2 forums-ede3963951a9701478b0a84bcacded916a72ba7c.tar.xz forums-ede3963951a9701478b0a84bcacded916a72ba7c.zip | |
Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
[ticket/10497] Fix SQL error when guest visits forum with unread topic
Diffstat (limited to 'phpBB/includes')
| -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 944e53052b..7ce83b871a 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1943,11 +1943,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); |