diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-11 13:08:24 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-11 13:08:24 -0500 |
| commit | 406c48c65535e79732a2d94e5031aa9b19ac2117 (patch) | |
| tree | e4c2bfd09dd4dde664b58db517a54b543b9e9000 /phpBB | |
| parent | 900525a0e45abb283bfa9699858823d449be8dd0 (diff) | |
| parent | 1ea1247cd583e1f3f45a4b83310dc3e934caf00d (diff) | |
| download | forums-406c48c65535e79732a2d94e5031aa9b19ac2117.tar forums-406c48c65535e79732a2d94e5031aa9b19ac2117.tar.gz forums-406c48c65535e79732a2d94e5031aa9b19ac2117.tar.bz2 forums-406c48c65535e79732a2d94e5031aa9b19ac2117.tar.xz forums-406c48c65535e79732a2d94e5031aa9b19ac2117.zip | |
Merge remote-tracking branch 'remotes/cyberalien/ticket/10772' into develop-olympus
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/10772:
[ticket/10772] Remove unnecessary comment
[ticket/10772] Functional tests for forum style
[ticket/10772] Use forum specific style for trigger_error
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/viewtopic.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 74420a25c7..fb12dd925a 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -146,7 +146,14 @@ if ($view && !$post_id) if (!$row) { - $user->setup('viewtopic'); + $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 |