stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-30 02:46:19 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move "item_moved" event later in the item update process. Fixes #2077.

Browse Source 
Before, this was before the children's caches were cleared, so if the
"item_moved" set an album cover, it would fail with an invalid path.  For the
same reason, we move it after the data file update, too.  Lastly, get we get
rid of duplicated code in item::move() since the "item_moved" event already
does this.
This commit is contained in:
shadlaws
2013-07-08 09:39:54 +02:00
parent 1882094460
commit d0aef95a65
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/helpers/item.php
-5
View File
@@ -63,11 +63,6 @@ class item_Core {
break;
}
}
// If the target has no cover item, make this it.
if ($target->album_cover_item_id == null) {
item::make_album_cover($source);
}
}
static function make_album_cover($item) {
modules/gallery/models/item.php
+5 -5
View File
@@ -498,11 +498,6 @@ class Item_Model_Core extends ORM_MPTT {
@rename($original->resize_path(), $this->resize_path());
@rename($original->thumb_path(), $this->thumb_path());
}
if ($original->parent_id != $this->parent_id) {
// This will result in 2 events since we'll still fire the item_updated event below
module::event("item_moved", $this, $original->parent());
}
}
// Changing the name, slug or parent ripples downwards
@@ -526,6 +521,11 @@ class Item_Model_Core extends ORM_MPTT {
$this->resize_dirty = 1;
}
if ($original->parent_id != $this->parent_id) {
// This will result in 2 events since we'll still fire the item_updated event below
module::event("item_moved", $this, $original->parent());
}
module::event("item_updated", $original, $this);
if ($this->data_file) {