diff options
| author | plegall <plg@piwigo.org> | 2015-08-12 14:06:55 +0200 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2015-08-12 14:06:55 +0200 |
| commit | 5579b1e1a3f1a2d845fe9dcf3d3710ff3258cdee (patch) | |
| tree | b2f88762236950f454d5e2c1261c659719a48f33 /admin | |
| parent | 221a3b7e58e0dde40ed0ff9b8bafa732f98fe9e2 (diff) | |
closes #346 chunk_size is now a config setting
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/include/photos_add_direct_prepare.inc.php | 3 | ||||
| -rw-r--r-- | admin/themes/default/template/photos_add_direct.tpl | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/admin/include/photos_add_direct_prepare.inc.php b/admin/include/photos_add_direct_prepare.inc.php index 34b025f13..6204fe841 100644 --- a/admin/include/photos_add_direct_prepare.inc.php +++ b/admin/include/photos_add_direct_prepare.inc.php @@ -44,6 +44,7 @@ $template->assign( 'F_ADD_ACTION'=> PHOTOS_ADD_BASE_URL, 'upload_max_filesize' => $upload_max_filesize, 'upload_max_filesize_shorthand' => $upload_max_filesize_shorthand, + 'chunk_size' => $conf['upload_form_chunk_size'], ) ); @@ -229,4 +230,4 @@ if (!isset($_SESSION['upload_hide_warnings'])) ); } -?>
\ No newline at end of file +?> diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl index ad9e80b07..71663fc20 100644 --- a/admin/themes/default/template/photos_add_direct.tpl +++ b/admin/themes/default/template/photos_add_direct.tpl @@ -86,7 +86,7 @@ jQuery(document).ready(function(){ // url : '../upload.php', url : 'ws.php?method=pwg.images.upload&format=json', - chunk_size: '500kb', + chunk_size: '{/literal}{$chunk_size}{literal}kb', filters : { // Maximum file size |