aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/message_parser.php
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2013-11-27 14:48:38 -0800
committerCesar G <prototech91@gmail.com>2014-01-17 19:20:36 -0800
commit9c1cacae42d5d993a004a311089d7ac943002dc5 (patch)
tree37d96df33f4f91810086c68db2015d673388de80 /phpBB/includes/message_parser.php
parent708622a0bba1656f8538767ab8d0e0260075dddc (diff)
downloadforums-9c1cacae42d5d993a004a311089d7ac943002dc5.tar
forums-9c1cacae42d5d993a004a311089d7ac943002dc5.tar.gz
forums-9c1cacae42d5d993a004a311089d7ac943002dc5.tar.bz2
forums-9c1cacae42d5d993a004a311089d7ac943002dc5.tar.xz
forums-9c1cacae42d5d993a004a311089d7ac943002dc5.zip
[ticket/11915] Provide the URL to the attachment when it's uploaded.
PHPBB3-11915
Diffstat (limited to 'phpBB/includes/message_parser.php')
-rw-r--r--phpBB/includes/message_parser.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index c964e1a5e2..ad6743b3a3 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1582,8 +1582,10 @@ class parse_message extends bbcode_firstpass
if (isset($this->plupload) && $this->plupload->is_active())
{
+ $download_url = append_sid("{$phpbb_root_path}download/file.{$phpEx}", 'mode=view&amp;id=' . $new_entry['attach_id']);
+
// Send the client the attachment data to maintain state
- $json_response->send($this->attachment_data);
+ $json_response->send(array('data' => $this->attachment_data, 'download_url' => $download_url));
}
}
}