aboutsummaryrefslogtreecommitdiffstats
path: root/admin/themes
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2014-10-06 09:29:35 +0000
committerplegall <plg@piwigo.org>2014-10-06 09:29:35 +0000
commit1dfbbbf11d31ec637e0e250f4b1f1daea88ef247 (patch)
tree11b4a952a2e0cf09ceee146fdc26edcbdb97a598 /admin/themes
parent83f267dc95eddb11e32e3e51984589615872c84a (diff)
merge r29900 from trunk to branch 2.7
bug 3153: fix the AddPhotos buttons on Iceweasel (and on iOS 8.0.2... sometimes). Patch by mmoy git-svn-id: http://piwigo.org/svn/branches/2.7@29903 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/themes')
-rw-r--r--admin/themes/default/template/photos_add_direct.tpl1
1 files changed, 1 insertions, 0 deletions
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index bb96b1fe3..a276b689c 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -64,6 +64,7 @@ jQuery(document).ready(function(){
jQuery("#uploader").pluploadQueue({
// General settings
browse_button : 'addFiles',
+ container : 'uploadForm',
// runtimes : 'html5,flash,silverlight,html4',
runtimes : 'html5',