diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-01-30 16:14:39 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-01-30 16:14:39 +0000 |
| commit | 4b5fab372ff69a809144dee3a0a7f90c219fe400 (patch) | |
| tree | 3835425dae514f7296b6aaf77eed81c7f2617a5f /phpBB/includes/functions_display.php | |
| parent | 140746089594307c9bc2ad084ea2355dcbddbe16 (diff) | |
| download | forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.tar forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.tar.gz forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.tar.bz2 forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.tar.xz forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.zip | |
merge with revision #r8350
git-svn-id: file:///svn/phpbb/trunk@8351 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 77b090bf0a..b752a0d157 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -27,7 +27,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod $forum_rows = $subforums = $forum_ids = $forum_ids_moderator = $forum_moderators = $active_forum_ary = array(); $parent_id = $visible_forums = 0; $sql_from = ''; - + // Mark forums read? $mark_read = request_var('mark', ''); @@ -438,7 +438,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod 'S_UNREAD' => $subforum['unread']) ); } - + $last_catless = $catless; } @@ -980,7 +980,7 @@ function display_user_activity(&$userdata) /** * Topic and forum watching common code */ -function watch_topic_forum($mode, &$s_watching, &$s_watching_img, $user_id, $forum_id, $topic_id, $notify_status = 'unset', $start = 0) +function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, $notify_status = 'unset', $start = 0) { global $template, $db, $user, $phpEx, $start, $phpbb_root_path; |