From 1db1d40414587c9adef663ef45aaa198c2b2ece0 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Mon, 6 Aug 2012 13:58:26 -0400 Subject: Add additional check for post_deleteUser so we don't delete any non-user shares with the same name --- lib/public/share.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/public') diff --git a/lib/public/share.php b/lib/public/share.php index 1ebbbccc901..26dd1369a20 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -833,8 +833,8 @@ class Share { public static function post_deleteUser($arguments) { // Delete any items shared with the deleted user - $query = \OC_DB::prepare('DELETE FROM *PREFIX*share WHERE share_with = ?'); - $result = $query->execute(array($arguments['uid'])); + $query = \OC_DB::prepare('DELETE FROM *PREFIX*share WHERE share_with = ? AND share_type = ? OR share_type = ?'); + $result = $query->execute(array($arguments['uid'], self::SHARE_TYPE_USER, self::$shareTypeGroupUserUnique)); // Delete any items the deleted user shared $query = \OC_DB::prepare('SELECT id FROM *PREFIX*share WHERE uid_owner = ?'); $result = $query->execute(array($arguments['uid'])); -- cgit v1.2.3