aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-07-10 15:26:27 +0200
committerTristan Darricau <github@nicofuma.fr>2014-07-10 15:26:27 +0200
commitcc0f93147393cffa7c4c5b05a1c7f67014e1a1d4 (patch)
treec9f5cf9ea6560ff452d1a1463b24de8804e5ffbe
parentd5fd1ecfc8c2898d57135cccb06b62e9c28f1ce2 (diff)
parent3a11fec5deff129de9b1839ac57194cf997e67f9 (diff)
downloadforums-cc0f93147393cffa7c4c5b05a1c7f67014e1a1d4.tar
forums-cc0f93147393cffa7c4c5b05a1c7f67014e1a1d4.tar.gz
forums-cc0f93147393cffa7c4c5b05a1c7f67014e1a1d4.tar.bz2
forums-cc0f93147393cffa7c4c5b05a1c7f67014e1a1d4.tar.xz
forums-cc0f93147393cffa7c4c5b05a1c7f67014e1a1d4.zip
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus: [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post
-rw-r--r--phpBB/includes/mcp/mcp_post.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index e81abd0c8e..1687409198 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -151,6 +151,7 @@ function mcp_post_details($id, $mode, $action)
if (sizeof($attachments))
{
+ $user->add_lang('viewtopic');
$update_count = array();
parse_attachments($post_info['forum_id'], $message, $attachments, $update_count);
}