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/viewtopic.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/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 42027b5131..be94b1af31 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -445,13 +445,15 @@ if ($start < 0 || $start > $total_posts) $viewtopic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&start=$start&$u_sort_param" . (($highlight_match) ? "&hilit=$highlight" : '')); // Are we watching this topic? -$s_watching_topic = $s_watching_topic_img = array(); -$s_watching_topic['link'] = $s_watching_topic['title'] = ''; -$s_watching_topic['is_watching'] = false; +$s_watching_topic = array( + 'link' => '', + 'title' => '', + 'is_watching' => false, +); if ($config['email_enable'] && $config['allow_topic_notify'] && $user->data['is_registered']) { - watch_topic_forum('topic', $s_watching_topic, $s_watching_topic_img, $user->data['user_id'], $forum_id, $topic_id, $topic_data['notify_status'], $start); + watch_topic_forum('topic', $s_watching_topic, $user->data['user_id'], $forum_id, $topic_id, $topic_data['notify_status'], $start); } // Bookmarks @@ -663,7 +665,7 @@ if (!empty($topic_data['poll_start'])) if ($update && $s_can_vote) { - + if (!sizeof($voted_id) || sizeof($voted_id) > $topic_data['poll_max_options'] || in_array(VOTE_CONVERTED, $cur_voted_id)) { $redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&start=$start"); @@ -681,7 +683,7 @@ if (!empty($topic_data['poll_start'])) { $message = 'VOTE_CONVERTED'; } - + $message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $redirect_url . '">', '</a>'); trigger_error($message); } |