Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev

2 files changed, 19 insertions, 6 deletions

diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index f2a77033..7f1ad43b 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -131,11 +131,15 @@ class Quick_Controller extends Controller {
     access::required("view", $item);
     access::required("edit", $item);
 
-    if ($item->is_album()) {
-      $form = album::get_edit_form($item);
-    } else {
-      $form = photo::get_edit_form($item);
+    switch ($item->type) {
+    case "album":
+      return print album::get_edit_form($item);
+
+    case "photo":
+      return print photo::get_edit_form($item);
+
+    case "movie":
+      return print movie::get_edit_form($item);
     }
-    print $form;
   }
 }
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index b6af0528..d7ddcd02 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -157,7 +157,16 @@ class Item_Model extends ORM_MPTT {
 
     @rename(VARPATH . "albums/$old_relative_path", VARPATH . "albums/$new_relative_path");
     @rename(VARPATH . "resizes/$old_relative_path", VARPATH . "resizes/$new_relative_path");
-    @rename(VARPATH . "thumbs/$old_relative_path", VARPATH . "thumbs/$new_relative_path");
+    if ($this->is_movie()) {
+      // Movie thumbnails have a .jpg extension
+      $old_relative_thumb_path = preg_replace("/...$/", "jpg", $old_relative_path);
+      $new_relative_thumb_path = preg_replace("/...$/", "jpg", $new_relative_path);
+      @rename(VARPATH . "thumbs/$old_relative_thumb_path",
+              VARPATH . "thumbs/$new_relative_thumb_path");
+    } else {
+      @rename(VARPATH . "thumbs/$old_relative_path", VARPATH . "thumbs/$new_relative_path");
+    }
+
     $this->name = $new_name;
 
     if ($this->is_album()) {