aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-07-11 17:30:32 -0400
committerMarc Alexander <admin@m-a-styles.de>2013-07-11 17:30:32 -0400
commitdc4687501a16b2c50a9ebfcb9f941a02d9572764 (patch)
tree58277fdfd34f4ee4381e8b6827efdd0ab58f0def /phpBB/viewtopic.php
parent599f83395f90c9a899b0e639ba5acacfb8ae372b (diff)
parent94e5bfaadad3be2bcda5347754c3f1b5be33c620 (diff)
downloadforums-dc4687501a16b2c50a9ebfcb9f941a02d9572764.tar
forums-dc4687501a16b2c50a9ebfcb9f941a02d9572764.tar.gz
forums-dc4687501a16b2c50a9ebfcb9f941a02d9572764.tar.bz2
forums-dc4687501a16b2c50a9ebfcb9f941a02d9572764.tar.xz
forums-dc4687501a16b2c50a9ebfcb9f941a02d9572764.zip
Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ticket/11548
Diffstat (limited to 'phpBB/viewtopic.php')
-rw-r--r--phpBB/viewtopic.php9
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