for password protected link shares the password is stored in shareWith, so we need...

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index be113568a3b2cb3ac6dfcbf0a7a206d5136325c3..00c7bed976cb4b03e67a6451018e1e2c92c24f83 100644 (file)
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1102,13 +1102,20 @@ class Share extends \OC\Share\Constants {
         * @return null
         */
        protected static function unshareItem(array $item, $newParent = null) {
+
+               $shareType = (int)$item['share_type'];
+               $shareWith = null;
+               if ($shareType !== \OCP\Share::SHARE_TYPE_LINK) {
+                       $shareWith = $item['share_with'];
+               }
+
                // Pass all the vars we have for now, they may be useful
                $hookParams = array(
                        'id'            => $item['id'],
                        'itemType'      => $item['item_type'],
                        'itemSource'    => $item['item_source'],
-                       'shareType'     => (int)$item['share_type'],
-                       'shareWith'     => $item['share_with'],
+                       'shareType'     => $shareType,
+                       'shareWith'     => $shareWith,
                        'itemParent'    => $item['parent'],
                        'uidOwner'      => $item['uid_owner'],
                );