summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-03-16 20:23:01 +0100
committerGitHub <noreply@github.com>2018-03-16 20:23:01 +0100
commit9aced256c2fcfa289c943947a0a4ecb21f3a7091 (patch)
treedd6912f035f7b82ff972783d53edf24a50fdb5b6
parente56759917b4d31b5e6629d2a4ff603e6745446bb (diff)
parentade05f40ec66039f92c157930d0faf537513d2ae (diff)
downloadnextcloud-server-9aced256c2fcfa289c943947a0a4ecb21f3a7091.tar.gz
nextcloud-server-9aced256c2fcfa289c943947a0a4ecb21f3a7091.zip
Merge pull request #8853 from nextcloud/remove-resolve-reshare
Remove unused resolveReshare of old sharing code
-rw-r--r--lib/private/Share/Share.php23
-rw-r--r--lib/public/Share.php10
2 files changed, 0 insertions, 33 deletions
diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php
index 4514cdbae1b..90a05ac51a8 100644
--- a/lib/private/Share/Share.php
+++ b/lib/private/Share/Share.php
@@ -283,29 +283,6 @@ class Share extends Constants {
}
/**
- * resolves reshares down to the last real share
- * @param array $linkItem
- * @return array file owner
- */
- public static function resolveReShare($linkItem)
- {
- if (isset($linkItem['parent'])) {
- $parent = $linkItem['parent'];
- while (isset($parent)) {
- $query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `id` = ?', 1);
- $item = $query->execute(array($parent))->fetchRow();
- if (isset($item['parent'])) {
- $parent = $item['parent'];
- } else {
- return $item;
- }
- }
- }
- return $linkItem;
- }
-
-
- /**
* Get the shared items of item type owned by the current user
* @param string $itemType
* @param int $format (optional) Format type must be defined by the backend
diff --git a/lib/public/Share.php b/lib/public/Share.php
index b7fb7296e49..011d56ab5af 100644
--- a/lib/public/Share.php
+++ b/lib/public/Share.php
@@ -85,16 +85,6 @@ class Share extends \OC\Share\Constants {
return \OC\Share\Share::getShareByToken($token, $checkPasswordProtection);
}
- /**
- * resolves reshares down to the last real share
- * @param array $linkItem
- * @return array file owner
- * @since 6.0.0
- */
- public static function resolveReShare($linkItem) {
- return \OC\Share\Share::resolveReShare($linkItem);
- }
-
/**
* Get the shared items of item type owned by the current user