diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-08-12 15:00:47 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-08-12 15:00:47 +0000 |
| commit | 09ad10a734c0993f9465e6ac3463951251602fc6 (patch) | |
| tree | 80b534897042b0bff883687f9248f67b7af393f6 /phpBB/viewtopic.php | |
| parent | 45964352e37217277527480fcd89222b33c22280 (diff) | |
| download | forums-09ad10a734c0993f9465e6ac3463951251602fc6.tar forums-09ad10a734c0993f9465e6ac3463951251602fc6.tar.gz forums-09ad10a734c0993f9465e6ac3463951251602fc6.tar.bz2 forums-09ad10a734c0993f9465e6ac3463951251602fc6.tar.xz forums-09ad10a734c0993f9465e6ac3463951251602fc6.zip | |
ok, i am very sorry, but this needs to be fixed.
Generally, our config table is not really suited for holding large datasets. Because feed settings for the forums to enable news feeds and excluded forums rely on the forums itself we have decided to introduce a forum_options table where custom options can be stored.
Additionally, for this to work across all DBMS we support, we added a new method to the DBAL for the bitwise AND operator.
Also moved the forum/topic feed template variable to the location where they belong to (forum and topic view)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9965 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 10f782089b..baaf3cfaf1 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -620,6 +620,7 @@ $template->assign_vars(array( 'S_DISPLAY_POST_INFO' => ($topic_data['forum_type'] == FORUM_POST && ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS)) ? true : false, 'S_DISPLAY_REPLY_INFO' => ($topic_data['forum_type'] == FORUM_POST && ($auth->acl_get('f_reply', $forum_id) || $user->data['user_id'] == ANONYMOUS)) ? true : false, + 'S_ENABLE_FEEDS_TOPIC' => ($config['feed_topic'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $topic_data['forum_options'])) ? true : false, 'U_TOPIC' => "{$server_path}viewtopic.$phpEx?f=$forum_id&t=$topic_id", 'U_FORUM' => $server_path, @@ -1180,7 +1181,7 @@ if ($config['load_cpf_viewtopic']) // Grab all profile fields from users in id cache for later use - similar to the poster cache $profile_fields_tmp = $cp->generate_profile_fields_template('grab', $id_cache); - + // filter out fields not to be displayed on viewtopic. Yes, it's a hack, but this shouldn't break any MODs. $profile_fields_cache = array(); foreach ($profile_fields_tmp as $profile_user_id => $profile_fields) |