diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-12-16 17:58:49 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-12-16 17:58:49 -0800 |
| commit | 9b3b9c6da640ee3856cc113917faef34ba77e3db (patch) | |
| tree | 8f200136b8ab4d1f2d71db741130761657c180d5 /modules/gallery/models | |
| parent | 4566c299c1d1756fa78bc873a2266c28e047118a (diff) | |
| parent | 02b3c4e70478519e3baa7df80fefd19ebdd6e2e3 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Diffstat (limited to 'modules/gallery/models')
| -rw-r--r-- | modules/gallery/models/item.php | 11 |
1 files changed, 10 insertions, 1 deletions
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()) { |