From 766429dccb6f2f4bb0010128de1a559e925ba337 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Fri, 28 Jan 2011 15:39:14 +0100
Subject: [PATCH] setPermission() already saves the share.

---
 ansel/lib/Storage.php       | 2 +-
 ansel/perms.php             | 1 -
 kronolith/lib/Kronolith.php | 4 +---
 trean/perms.php             | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ansel/lib/Storage.php b/ansel/lib/Storage.php
index 3fff10860..d38365d51 100644
--- a/ansel/lib/Storage.php
+++ b/ansel/lib/Storage.php
@@ -213,7 +213,7 @@ class Ansel_Storage
                 }
             }
         }
-        $gallery->setPermission($perm, true);
+        $gallery->setPermission($perm);
 
         /* Initial tags */
         if (count($tags)) {
diff --git a/ansel/perms.php b/ansel/perms.php
index 1e8662daf..82510b6fa 100644
--- a/ansel/perms.php
+++ b/ansel/perms.php
@@ -233,7 +233,6 @@ case 'editforminherit':
         }
 
         $share->setPermission($perm);
-        $share->save();
 
         /* If we were asked to, push permissions to all child shares
          * to. */
diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 0fe7c1c21..e843aaaf0 100644
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -1151,7 +1151,6 @@ class Kronolith
                             $perm->addGroupPermission($group_id, $perm_value, false);
                         }
                         $share->setPermission($perm);
-                        $share->save();
                         $GLOBALS['notification']->push(sprintf(_("New calendar created and automatically shared with the following group(s): %s."), implode(', ', $group_list)), 'horde.success');
                     }
                 } catch (Horde_Group_Exception $e) {}
@@ -1940,8 +1939,7 @@ class Kronolith
             }
         }
         try {
-            $share->setPermission($perm, false);
-            $share->save();
+            $share->setPermission($perm);
         } catch (Horde_Share_Exception $e) {
             throw new Kronolith_Exception($e);
         }
diff --git a/trean/perms.php b/trean/perms.php
index 61190e3bc..df97ad88a 100644
--- a/trean/perms.php
+++ b/trean/perms.php
@@ -217,7 +217,6 @@ case 'editforminherit':
         }
 
         $share->setPermission($perm);
-        $share->save();
 
         /* If we were asked to, push permissions to all child shares
          * to. */
-- 
2.11.0