From: Andreas Fischer <bantu@owncloud.com>
Date: Mon, 23 Sep 2013 14:43:08 +0000 (+0200)
Subject: Extract unshare() code into unshareItem().
X-Git-Tag: v6.0.0beta3~21^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1d1f5b288e404c8c69aa4550b0f4fa9508b00204;p=nextcloud-server.git

Extract unshare() code into unshareItem().
---

diff --git a/lib/public/share.php b/lib/public/share.php
index a8d1436e100..2d56ea7220c 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -634,23 +634,7 @@ class Share {
 	public static function unshare($itemType, $itemSource, $shareType, $shareWith) {
 		if ($item = self::getItems($itemType, $itemSource, $shareType, $shareWith, \OC_User::getUser(),
 			self::FORMAT_NONE, null, 1)) {
-			// Pass all the vars we have for now, they may be useful
-			\OC_Hook::emit('OCP\Share', 'pre_unshare', array(
-				'itemType' => $itemType,
-				'itemSource' => $itemSource,
-				'fileSource' => $item['file_source'],
-				'shareType' => $shareType,
-				'shareWith' => $shareWith,
-				'itemParent' => $item['parent'],
-			));
-			self::delete($item['id']);
-			\OC_Hook::emit('OCP\Share', 'post_unshare', array(
-					'itemType' => $itemType,
-					'itemSource' => $itemSource,
-					'shareType' => $shareType,
-					'shareWith' => $shareWith,
-					'itemParent' => $item['parent'],
-			));
+			self::unshareItem($item);
 			return true;
 		}
 		return false;