2 files changed, 12 insertions, 2 deletions
diff --git a/phpBB/assets/javascript/plupload.js b/phpBB/assets/javascript/plupload.js
index 3e450e9bab..f84a8b0a56 100644
--- a/phpBB/assets/javascript/plupload.js
+++ b/phpBB/assets/javascript/plupload.js
@@ -218,7 +218,6 @@ phpbb.plupload.updateRow = function(index, downloadUrl) {
 	}
 
 	row.find('textarea').attr('name', 'comment_list[' + index + ']');
-	row.find('.file-inline-bbcode').attr('onclick', 'attach_inline(' + index + ',\'' + attach.real_filename + '\');');
 	phpbb.plupload.updateHiddenData(row, attach, index);
 };
 
@@ -489,6 +488,17 @@ phpbb.plupload.initialize();
 
 
 /**
+ * Insert inline attachment bbcode.
+ */
+ $('#file-list').on('click', '.file-inline-bbcode', function(e) {
+	var attachId = $(this).parents('.attach-row').attr('data-attach-id'),
+		index = phpbb.plupload.getIndex(attachId);
+
+	attach_inline(index, phpbb.plupload.data[index].real_filename);	
+	e.preventDefault();
+});
+
+/**
  * Delete a file.
  */
 $('#file-list').on('click', '.file-delete', function(e) {
diff --git a/phpBB/styles/prosilver/template/posting_attach_body.html b/phpBB/styles/prosilver/template/posting_attach_body.html
index 348aded5c1..8a2004c29b 100644
--- a/phpBB/styles/prosilver/template/posting_attach_body.html
+++ b/phpBB/styles/prosilver/template/posting_attach_body.html
@@ -64,7 +64,7 @@
 							<td class="attach-name">
 								<span class="file-name"><a href="{attach_row.U_VIEW_ATTACHMENT}">{attach_row.FILENAME}</a></span>
 								<span class="attach-controls">
-									<!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" onclick="attach_inline({attach_row.ASSOC_INDEX}, '{attach_row.A_FILENAME}');" class="button2 file-inline-bbcode" />&nbsp; <!-- ENDIF -->
+									<!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" class="button2 file-inline-bbcode" />&nbsp; <!-- ENDIF -->
 									<input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2 file-delete" />
 								</span>
 								<span class="clear"></span>