From 801c9a98e438a9c6a072630c3a051435986f6cf0 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 5 May 2012 18:52:44 -0700
Subject: Fix #1846.

---
 modules/gallery/models/item.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'modules/gallery/models')

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index e90e0fcb..0e3f0fb8 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -803,18 +803,22 @@ class Item_Model_Core extends ORM_MPTT {
     }
 
     if ($this->is_movie() || $this->is_photo()) {
-      if (!$this->loaded()) {
+      $ext = pathinfo($this->name, PATHINFO_EXTENSION);
+
+      if (!$this->loaded() && !$ext) {
         // New items must have an extension
-        $ext = pathinfo($this->name, PATHINFO_EXTENSION);
-        if (!$ext) {
+        $v->add_error("name", "illegal_data_file_extension");
+        return;
+      }
+
+      if ($this->is_photo()) {
+        if (!in_array(strtolower($ext), legal_file::get_photo_extensions())) {
           $v->add_error("name", "illegal_data_file_extension");
-          return;
         }
+      }
 
-        if ($this->is_photo() &&
-            !in_array(strtolower($ext), array_map("strtolower", legal_file::get_photo_extensions())) ||
-            $this->is_movie() &&
-            !in_array(strtolower($ext), array_map("strtolower", legal_file::get_movie_extensions()))) {
+      if ($this->is_movie()) {
+        if (!in_array(strtolower($ext), legal_file::get_movie_extensions())) {
           $v->add_error("name", "illegal_data_file_extension");
         }
       }
-- 
cgit v1.2.3