sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22316 from owncloud/fix_22309 

Properly check for legacy methods on IShare objects
remotes/origin/users-ajaxloadgroups
Morris Jobke 2016-02-11 13:02:52 +07:00
parent 06af9b817e dd630e33ea
commit 73e3737777
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/share20/manager.php
Unescape Escape View File

@ -720,7 +720,7 @@ class Manager implements IManager {
'itemSource' => $share->getNodeId(),
'shareType' => $shareType,
'shareWith' => $sharedWith,
'itemparent' => $share->getParent(),
'itemparent' => method_exists($share, 'getParent') ? $share->getParent() : '',
'uidOwner' => $share->getSharedBy(),
'fileSource' => $share->getNodeId(),
'fileTarget' => $share->getTarget()

11
lib/private/share20/share.php
Unescape Escape View File

@ -321,7 +321,11 @@ class Share implements \OCP\Share\IShare {
}
/**
* @inheritdoc
* Set the parent of this share
*
* @param int parent
* @return \OCP\Share\IShare
* @deprecated The new shares do not have parents. This is just here for legacy reasons.
*/
public function setParent($parent) {
$this->parent = $parent;
@ -329,7 +333,10 @@ class Share implements \OCP\Share\IShare {
}
/**
* @inheritdoc
* Get the parent of this share.
*
* @return int
* @deprecated The new shares do not have parents. This is just here for legacy reasons.
*/
public function getParent() {
return $this->parent;