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

1 files changed, 7 insertions, 0 deletions

diff --git a/modules/gallery/controllers/permissions.php b/modules/gallery/controllers/permissions.php
index c776a0fd..5f4620b2 100644
--- a/modules/gallery/controllers/permissions.php
+++ b/modules/gallery/controllers/permissions.php
@@ -71,6 +71,13 @@ class Permissions_Controller extends Controller {
         access::reset($group, $perm->name, $item);
         break;
       }
+
+      // If the active user just took away their own edit permissions, give it back.
+      if ($perm->name == "edit") {
+        if (!access::user_can(user::active(), "edit", $item)) {
+          access::allow($group, $perm->name, $item);
+        }
+      }
     }
   }