summaryrefslogtreecommitdiff
path: root/modules/gallery/views
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-12-05 17:56:31 -0800
committerBharat Mediratta <bharat@menalto.com>2009-12-05 17:56:31 -0800
commit62693db037729f18db42d3959c73e470d1b106f1 (patch)
treecb4eccc050afeb635b7308fef097dc6ac0912eb4 /modules/gallery/views
parentc7b934bc6daf41af1b6e0b04b9b0e9cb22113db6 (diff)
parentfcbf824c05a7ba61391c0b5afc1589436490e7ba (diff)
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Diffstat (limited to 'modules/gallery/views')
-rw-r--r--modules/gallery/views/form_uploadify.html.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 5e99c8d5..d856c464 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -24,7 +24,7 @@
fileDesc: <?= t("Photos and movies")->for_js() ?>,
cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>",
buttonText: <?= t("Select photos...")->for_js() ?>,
- simUploadLimit: 10,
+ simUploadLimit: <?= $simultaneous_upload_limit ?>,
wmode: "transparent",
hideButton: true, /* should be true */
auto: true,