diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-11 13:12:41 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-11 13:12:41 -0500 |
| commit | cb0335ebcb580eafaf1bd2bed1663b31af77ef40 (patch) | |
| tree | 62cd59e6d2ef176ae27616c712b22fd2488bf3b3 /phpBB/viewtopic.php | |
| parent | 5b81cad775bcb65fc48a17e5e80c4bde61ac502d (diff) | |
| parent | c2f5ba69f0fb03a30d4f3cbf1e6d49e019edea7c (diff) | |
| download | forums-cb0335ebcb580eafaf1bd2bed1663b31af77ef40.tar forums-cb0335ebcb580eafaf1bd2bed1663b31af77ef40.tar.gz forums-cb0335ebcb580eafaf1bd2bed1663b31af77ef40.tar.bz2 forums-cb0335ebcb580eafaf1bd2bed1663b31af77ef40.tar.xz forums-cb0335ebcb580eafaf1bd2bed1663b31af77ef40.zip | |
Merge remote-tracking branch 'remotes/cyberalien/ticket/develop/10772' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/develop/10772:
[ticket/develop/10772] Fix copyright year
[ticket/develop/10772] Unit tests for forum specific style
[ticket/10772] Use forum specific style for trigger_error
Diffstat (limited to 'phpBB/viewtopic.php')
| -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 |