summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/simple_uploader.php
diff options
context:
space:
mode:
authorAndy Staudacher <andy.st@gmail.com>2009-06-16 20:26:49 -0700
committerAndy Staudacher <andy.st@gmail.com>2009-06-16 20:26:49 -0700
commit06ed45f0cb867057eefd5a45d04cba6b8be41411 (patch)
treef4ec5ebff47b9264734a06a611172277acb3c9a1 /modules/gallery/controllers/simple_uploader.php
parentbe226b9baa8ce21431e35c32277fda2e8c94a216 (diff)
parentbaea5e3a1b5a258269accb7ee53f5167607833c2 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/controllers/simple_uploader.php')
-rw-r--r--modules/gallery/controllers/simple_uploader.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/gallery/controllers/simple_uploader.php b/modules/gallery/controllers/simple_uploader.php
index dfbd4f17..e68df2b8 100644
--- a/modules/gallery/controllers/simple_uploader.php
+++ b/modules/gallery/controllers/simple_uploader.php
@@ -39,7 +39,8 @@ class Simple_Uploader_Controller extends Controller {
access::verify_csrf();
$file_validation = new Validation($_FILES);
- $file_validation->add_rules("Filedata", "upload::valid", "upload::type[gif,jpg,png,flv,mp4]");
+ $file_validation->add_rules(
+ "Filedata", "upload::valid", "upload::type[gif,jpg,jpeg,png,flv,mp4]");
if ($file_validation->validate()) {
// SimpleUploader.swf does not yet call /start directly, so simulate it here for now.
if (!batch::in_progress()) {