diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-06-04 17:37:52 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-06-04 17:37:52 -0700 |
| commit | 59f3a8486421e94b42c110b6843dff53e9aac91e (patch) | |
| tree | 4595cb17065d35086318e991e5fb19852001b05b /modules | |
| parent | 8d9010cfe381ddff870c29dd67b687905595ce1f (diff) | |
| parent | 9306c178a86c9a29402b34c9939ddf4969e0d022 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gallery/views/simple_uploader.html.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php index 7b90c5be..6b097108 100644 --- a/modules/gallery/views/simple_uploader.html.php +++ b/modules/gallery/views/simple_uploader.html.php @@ -80,7 +80,7 @@ "user_agent": "<?= Input::instance()->server("HTTP_USER_AGENT") ?>", "csrf": "<?= $csrf ?>" }, - file_size_limit : "100 MB", + file_size_limit : "<?= (!ini_get('upload_max_filesize')=="" ? ini_get('upload_max_filesize') : "100M") ?>", file_types : "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4", file_types_description : "<?= t("Photos and Movies") ?>", file_upload_limit : 1000, |