Merge commit 'upstream/master'

1 files changed, 6 insertions, 2 deletions

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index aa11b7c0..1cd96372 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -23,7 +23,7 @@ class gallery_event_Core {
     access::add_group($group);
   }
 
-  static function group_before_delete($group) {
+  static function group_deleted($group) {
     access::delete_group($group);
   }
 
@@ -31,10 +31,14 @@ class gallery_event_Core {
     access::add_item($item);
   }
 
-  static function item_before_delete($item) {
+  static function item_deleted($item) {
     access::delete_item($item);
   }
 
+  static function item_moved($item, $old_parent) {
+    access::recalculate_permissions($item->parent());
+  }
+
   static function user_login($user) {
     // If this user is an admin, check to see if there are any post-install tasks that we need
     // to run and take care of those now.