diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-10-19 13:57:43 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-10-19 13:57:43 +0200 |
| commit | 2264f88d8226336584b62d14e36f44b33712ceb0 (patch) | |
| tree | 9358468470c1c6699859d85f652aedb74c63073d /phpBB/includes/functions.php | |
| parent | 6213188280a8a0088fcfacc0f992075f887d3000 (diff) | |
| parent | 5f0f8c25be2c51b3699768ca7857e477ac68a061 (diff) | |
| download | forums-2264f88d8226336584b62d14e36f44b33712ceb0.tar forums-2264f88d8226336584b62d14e36f44b33712ceb0.tar.gz forums-2264f88d8226336584b62d14e36f44b33712ceb0.tar.bz2 forums-2264f88d8226336584b62d14e36f44b33712ceb0.tar.xz forums-2264f88d8226336584b62d14e36f44b33712ceb0.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9509] Remove section 8 from index
[ticket/9509] Close anchor tag in coding guidelines
[ticket/9854] Revise docs/auth_api.html to add more methods
[ticket/9509] The VCS is now git
[ticket/9840] Display view unread posts link for guests.
Conflicts:
phpBB/docs/coding-guidelines.html
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 912d39e0f0..0f150a3d63 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4399,7 +4399,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'S_ENABLE_FEEDS_TOPICS_ACTIVE' => ($config['feed_topics_active']) ? true : false, 'S_ENABLE_FEEDS_NEWS' => ($s_feed_news) ? true : false, - 'S_LOAD_UNREADS' => ($config['load_unreads_search']) ? true : false, + 'S_LOAD_UNREADS' => ($config['load_unreads_search'] && ($config['load_anon_lastread'] || $user->data['is_registered'])) ? true : false, 'T_THEME_PATH' => "{$web_path}styles/" . $user->theme['theme_path'] . '/theme', 'T_TEMPLATE_PATH' => "{$web_path}styles/" . $user->theme['template_path'] . '/template', |