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/includes | |
| 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/includes')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 87dfdf902b..3d95dc9a97 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -1081,6 +1081,7 @@ function compose_pm($id, $mode, $action, $user_folders = array()) 'S_SAVE_ALLOWED' => ($auth->acl_get('u_savedrafts') && $action != 'edit') ? true : false, 'S_HAS_DRAFTS' => ($auth->acl_get('u_savedrafts') && $drafts), 'S_FORM_ENCTYPE' => $form_enctype, + 'S_ATTACH_DATA' => json_encode($message_parser->attachment_data), 'S_BBCODE_IMG' => $img_status, 'S_BBCODE_FLASH' => $flash_status, @@ -1104,7 +1105,8 @@ function compose_pm($id, $mode, $action, $user_folders = array()) if ($allowed) { - $plupload->configure($cache, $template, $s_action, false); + $max_files = ($auth->acl_gets('a_', 'm_')) ? 0 : (int) $config['max_attachments_pm']; + $plupload->configure($cache, $template, $s_action, false, $max_files); } // Attachment entry |