diff options
| author | Vjacheslav Trushkin <cyberalien@gmail.com> | 2013-05-12 12:42:22 +0300 |
|---|---|---|
| committer | Vjacheslav Trushkin <cyberalien@gmail.com> | 2013-05-12 12:42:22 +0300 |
| commit | f3c547bc8dadf50e00f3cd503dfb9f116b4f838b (patch) | |
| tree | b0fb30934e706959f42255914e19271e654c974f /phpBB | |
| parent | 18e82931dccbe0537a06f2e6570653e19db372dd (diff) | |
| parent | 170333a6fca0dcc227152b3c8da79fad3bd6f475 (diff) | |
| download | forums-f3c547bc8dadf50e00f3cd503dfb9f116b4f838b.tar forums-f3c547bc8dadf50e00f3cd503dfb9f116b4f838b.tar.gz forums-f3c547bc8dadf50e00f3cd503dfb9f116b4f838b.tar.bz2 forums-f3c547bc8dadf50e00f3cd503dfb9f116b4f838b.tar.xz forums-f3c547bc8dadf50e00f3cd503dfb9f116b4f838b.zip | |
Merge branch 'ticket/10772' into ticket/develop/10772
* ticket/10772:
[ticket/10772] Use forum specific style for trigger_error
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/viewtopic.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 59ef7bbc80..62ee5cc8de 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -145,7 +145,15 @@ if ($view && !$post_id) if (!$row) { - $user->setup('viewtopic'); + // Check for forum style + $sql = 'SELECT forum_style + FROM ' . FORUMS_TABLE . " + WHERE forum_id = $forum_id"; + $result = $db->sql_query($sql); + $forum_style = (int) $db->sql_fetchfield('forum_style'); + $db->sql_freeresult($result); + + $user->setup('viewtopic', $forum_style); trigger_error(($view == 'next') ? 'NO_NEWER_TOPICS' : 'NO_OLDER_TOPICS'); } else |