aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-01-12 23:56:48 +0100
committerJoas Schilling <nickvergessen@gmx.de>2015-01-12 23:56:48 +0100
commitae54d3d01f3f0bd31d9d3d406a2d5dffb6b4aa88 (patch)
tree4367ebdd831131701b7422a268a8225b95ccfff6
parentaeafbb5c625133c38dcd282198c2d162799810f5 (diff)
parentb27c0ab992af06582726b19c155e30ee765d113d (diff)
downloadforums-ae54d3d01f3f0bd31d9d3d406a2d5dffb6b4aa88.tar
forums-ae54d3d01f3f0bd31d9d3d406a2d5dffb6b4aa88.tar.gz
forums-ae54d3d01f3f0bd31d9d3d406a2d5dffb6b4aa88.tar.bz2
forums-ae54d3d01f3f0bd31d9d3d406a2d5dffb6b4aa88.tar.xz
forums-ae54d3d01f3f0bd31d9d3d406a2d5dffb6b4aa88.zip
Merge branch 'develop-ascraeus' into develop
-rw-r--r--phpBB/posting.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 10c3b696e6..ac412c0c73 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1736,7 +1736,7 @@ $page_data = array(
'POST_DATE' => ($post_data['post_time']) ? $user->format_date($post_data['post_time']) : '',
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
'TOPIC_TIME_LIMIT' => (int) $post_data['topic_time_limit'],
- 'EDIT_REASON' => $request->variable('edit_reason', ''),
+ 'EDIT_REASON' => $request->variable('edit_reason', '', true),
'SHOW_PANEL' => $request->variable('show_panel', ''),
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id"),
'U_VIEW_TOPIC' => ($mode != 'post') ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id") : '',