diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-10 11:59:32 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-10 11:59:32 +0200 |
| commit | 20c6139ad1a556288e89648c7b5a2951009a3ddc (patch) | |
| tree | 36dccb55e4e142def645552fdcbcec4d3d0debce /phpBB/phpbb | |
| parent | b785fff3edc985cc8b4b069bb1ef5f6194383f42 (diff) | |
| parent | a8ec1905e18fda73c440373d696bf9d3b0e06b60 (diff) | |
| download | forums-20c6139ad1a556288e89648c7b5a2951009a3ddc.tar forums-20c6139ad1a556288e89648c7b5a2951009a3ddc.tar.gz forums-20c6139ad1a556288e89648c7b5a2951009a3ddc.tar.bz2 forums-20c6139ad1a556288e89648c7b5a2951009a3ddc.tar.xz forums-20c6139ad1a556288e89648c7b5a2951009a3ddc.zip | |
Merge remote-tracking branch 'prototech/ticket/12356' into develop-ascraeus
* prototech/ticket/12356:
[ticket/12356] Assign vars preventing Plupload from loading in PM editor.
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/plupload/plupload.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php index 6bff2b8a7e..b988ce7ce0 100644 --- a/phpBB/phpbb/plupload/plupload.php +++ b/phpBB/phpbb/plupload/plupload.php @@ -146,10 +146,11 @@ class plupload * @param \phpbb\template\template $template * @param string $s_action The URL to submit the POST data to * @param int $forum_id The ID of the forum + * @param int $max_files Maximum number of files allowed. 0 for unlimited. * * @return null */ - public function configure(\phpbb\cache\service $cache, \phpbb\template\template $template, $s_action, $forum_id) + public function configure(\phpbb\cache\service $cache, \phpbb\template\template $template, $s_action, $forum_id, $max_files) { $filters = $this->generate_filter_string($cache, $forum_id); $chunk_size = $this->get_chunk_size(); @@ -161,6 +162,9 @@ class plupload 'FILTERS' => $filters, 'CHUNK_SIZE' => $chunk_size, 'S_PLUPLOAD_URL' => htmlspecialchars_decode($s_action), + 'MAX_ATTACHMENTS' => $max_files, + 'ATTACH_ORDER' => ($this->config['display_order']) ? 'asc' : 'desc', + 'L_TOO_MANY_ATTACHMENTS' => $this->user->lang('TOO_MANY_ATTACHMENTS', $max_files), )); $this->user->add_lang('plupload'); |