diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-05-14 17:27:20 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-05-14 17:27:20 +0000 |
| commit | 6bf767ae77c21655ad2548061961a86c94c57c81 (patch) | |
| tree | 7a06bab6ba0a85e249dde464eb75042b094c7b86 /phpBB/includes | |
| parent | 24d2101805f3ad48bfa7c6289c2c0c62ddbc8cbe (diff) | |
| download | forums-6bf767ae77c21655ad2548061961a86c94c57c81.tar forums-6bf767ae77c21655ad2548061961a86c94c57c81.tar.gz forums-6bf767ae77c21655ad2548061961a86c94c57c81.tar.bz2 forums-6bf767ae77c21655ad2548061961a86c94c57c81.tar.xz forums-6bf767ae77c21655ad2548061961a86c94c57c81.zip | |
Fix bad URL for topic notifications
git-svn-id: file:///svn/phpbb/trunk@2581 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_post.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/functions_post.php b/phpBB/includes/functions_post.php index 14e0431b43..0e9f4db454 100644 --- a/phpBB/includes/functions_post.php +++ b/phpBB/includes/functions_post.php @@ -649,7 +649,7 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id $emailer = new emailer($board_config['smtp_delivery']); $script_name = preg_replace('/^\/?(.*?)\/?$/', '\1', trim($board_config['script_path'])); - $script_name = ( $script_name != '' ) ? $script_name . '/viewforum.'.$phpEx : 'viewforum.'.$phpEx; + $script_name_f = ( $script_name != '' ) ? $script_name . '/viewforum.'.$phpEx : 'viewforum.'.$phpEx; $server_name = trim($board_config['server_name']); $server_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://'; $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/'; @@ -676,8 +676,8 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id 'SITENAME' => $board_config['sitename'], 'FORUM_NAME' => $forum_name, - 'U_FORUM' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_FORUM_URL . "=$forum_id", - 'U_STOP_WATCHING_FORUM' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_FORUM_URL . "=$forum_id&unwatch=forum") + 'U_FORUM' => $server_protocol . $server_name . $server_port . $script_name_f . '?' . POST_FORUM_URL . "=$forum_id", + 'U_STOP_WATCHING_FORUM' => $server_protocol . $server_name . $server_port . $script_name_f . '?' . POST_FORUM_URL . "=$forum_id&unwatch=forum") ); $emailer->send(); @@ -712,7 +712,7 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id message_die(GENERAL_ERROR, 'Could not obtain list of topic watchers', '', __LINE__, __FILE__, $sql); } - $script_name = ( $script_name != '' ) ? $script_name . '/viewtopic.'.$phpEx : 'viewtopic.'.$phpEx; + $script_name_t = ( $script_name != '' ) ? $script_name . '/viewtopic.'.$phpEx : 'viewtopic.'.$phpEx; $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; $update_watched_sql = ''; @@ -735,8 +735,8 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id 'SITENAME' => $board_config['sitename'], 'TOPIC_TITLE' => $topic_title, - 'U_TOPIC' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_POST_URL . "=$post_id#$post_id", - 'U_STOP_WATCHING_TOPIC' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_TOPIC_URL . "=$topic_id&unwatch=topic") + 'U_TOPIC' => $server_protocol . $server_name . $server_port . $script_name_t . '?' . POST_POST_URL . "=$post_id#$post_id", + 'U_STOP_WATCHING_TOPIC' => $server_protocol . $server_name . $server_port . $script_name_t . '?' . POST_TOPIC_URL . "=$topic_id&unwatch=topic") ); $emailer->send(); |