aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-02-20 11:40:19 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2011-02-20 11:40:19 -0500
commitc025d6079b3883dae133e23bca39dbcb35c4c064 (patch)
treec456825d526d9effa6276bd60ca7305ab249db2f
parentf24fe7b09e2d4140f4a0cd4b6ff9caf85d007cb3 (diff)
parent53a6cd607e36ccd099f3d83431bf8bfee48dc7b3 (diff)
downloadforums-c025d6079b3883dae133e23bca39dbcb35c4c064.tar
forums-c025d6079b3883dae133e23bca39dbcb35c4c064.tar.gz
forums-c025d6079b3883dae133e23bca39dbcb35c4c064.tar.bz2
forums-c025d6079b3883dae133e23bca39dbcb35c4c064.tar.xz
forums-c025d6079b3883dae133e23bca39dbcb35c4c064.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10047] Do not put session id in URL on posting.php when cookies are on.
-rw-r--r--phpBB/posting.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 31a9744dcf..41559056b9 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1360,8 +1360,8 @@ $lock_post_checked = (isset($post_lock)) ? $post_lock : $post_data['post_edit_lo
$notify_set = ($mode != 'edit' && $config['allow_topic_notify'] && $user->data['is_registered'] && !$post_data['notify_set']) ? $user->data['user_notify'] : $post_data['notify_set'];
$notify_checked = (isset($notify)) ? $notify : (($mode == 'post') ? $user->data['user_notify'] : $notify_set);
-// Page title & action URL, include session_id for security purpose
-$s_action = append_sid("{$phpbb_root_path}posting.$phpEx", "mode=$mode&amp;f=$forum_id", true, $user->session_id);
+// Page title & action URL
+$s_action = append_sid("{$phpbb_root_path}posting.$phpEx", "mode=$mode&amp;f=$forum_id");
$s_action .= ($topic_id) ? "&amp;t=$topic_id" : '';
$s_action .= ($post_id) ? "&amp;p=$post_id" : '';