diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-11-09 06:50:19 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-11-09 06:50:19 -0800 |
| commit | 0dbf0d51733aa3ef7840a23aeac6dfbe92d014e2 (patch) | |
| tree | 23b3d703de834a7dd726ce11e90b47eac3b90a28 /modules/gallery/controllers | |
| parent | 6d57d4308bb2e82d41f9a4667ab35748854d7143 (diff) | |
| parent | 6ddbef3dcd3ee34e622bc7286ebf138b7ef1ffaa (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/gallery/controllers')
| -rw-r--r-- | modules/gallery/controllers/movies.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php index 6200e8b4..5e78376b 100644 --- a/modules/gallery/controllers/movies.php +++ b/modules/gallery/controllers/movies.php @@ -66,7 +66,7 @@ class Movies_Controller extends Items_Controller { if ($valid) { $new_ext = pathinfo($form->edit_item->filename->value, PATHINFO_EXTENSION); - $old_ext = pathinfo($photo->name, PATHINFO_EXTENSION); + $old_ext = pathinfo($movie->name, PATHINFO_EXTENSION); if (strcasecmp($new_ext, $old_ext)) { $form->edit_item->filename->add_error("illegal_extension", 1); $valid = false; |