2 files changed, 10 insertions, 7 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 344fdff8a6..e4be20a91b 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1116,13 +1116,15 @@ class parse_message extends bbcode_firstpass
 	/**
 	* Get Attachment Data
 	*/
-	function get_submitted_attachment_data()
+	function get_submitted_attachment_data($check_user_id = false)
 	{
 		global $user, $db, $phpbb_root_path, $phpEx, $config;
 
 		$this->filename_data['filecomment'] = request_var('filecomment', '', true);
 		$this->attachment_data = (isset($_POST['attachment_data'])) ? $_POST['attachment_data'] : array();
 
+		$check_user_id = ($check_user_id === false) ? $user->data['user_id'] : $check_user_id;
+
 		// Regenerate data array...
 		$attach_ids = $filenames = array();
 
@@ -1149,7 +1151,7 @@ class parse_message extends bbcode_firstpass
 			$sql = 'SELECT attach_id, physical_filename, real_filename, extension, mimetype, filesize, filetime, thumbnail
 				FROM ' . ATTACHMENTS_TABLE . '
 				WHERE attach_id IN (' . implode(', ', array_keys($attach_ids)) . ')
-					AND poster_id = ' . $user->data['user_id'];
+					AND poster_id = ' . $check_user_id;
 			$result = $db->sql_query($sql);
 
 			while ($row = $db->sql_fetchrow($result))
@@ -1167,7 +1169,7 @@ class parse_message extends bbcode_firstpass
 
 			if (sizeof($attach_ids))
 			{
-				trigger_error('NO_ACCESS_ATTACHMENT');
+				trigger_error($user->lang['NO_ACCESS_ATTACHMENT'], E_USER_ERROR);
 			}
 		}
 
@@ -1175,7 +1177,7 @@ class parse_message extends bbcode_firstpass
 		if (sizeof($filenames))
 		{
 			include_once($phpbb_root_path . 'includes/functions_upload.' . $phpEx);
-			
+
 			$sql = 'SELECT attach_id
 				FROM ' . ATTACHMENTS_TABLE . "
 				WHERE LOWER(physical_filename) IN ('" . implode("', '", array_map('strtolower', $filenames)) . "')";
@@ -1185,7 +1187,7 @@ class parse_message extends bbcode_firstpass
 
 			if ($row)
 			{
-				trigger_error('NO_ACCESS_ATTACHMENT');
+				trigger_error($user->lang['NO_ACCESS_ATTACHMENT'], E_USER_ERROR);
 			}
 
 			foreach ($filenames as $pos => $physical_filename)
diff --git a/phpBB/posting.php b/phpBB/posting.php
index ed725e062e..60e1411d41 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -297,10 +297,9 @@ if (isset($post_data['post_text']))
 	unset($post_data['post_text']);
 }
 
-$message_parser->get_submitted_attachment_data();
-
 // Set some default variables
 $uninit = array('post_attachment' => 0, 'poster_id' => $user->data['user_id'], 'enable_magic_url' => 0, 'topic_status' => 0, 'topic_type' => POST_NORMAL, 'post_subject' => '', 'topic_title' => '', 'post_time' => 0, 'post_edit_reason' => '', 'notify_set' => 0);
+
 foreach ($uninit as $var_name => $default_value)
 {
 	if (!isset($post_data[$var_name]))
@@ -310,6 +309,8 @@ foreach ($uninit as $var_name => $default_value)
 }
 unset($uninit);
 
+$message_parser->get_submitted_attachment_data($post_data['poster_id']);
+
 if ($post_data['post_attachment'] && !$submit && !$refresh && !$preview && $mode == 'edit')
 {
 	$sql = 'SELECT attach_id, physical_filename, comment, real_filename, extension, mimetype, filesize, filetime, thumbnail