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

some small fixes

remotes/origin/fix-10825
Bjoern Schiessle 2014-09-25 11:29:57 +07:00
parent 5c7fe91041
commit d5fc011c90
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files_sharing/lib/sharedmount.php
Unescape Escape View File

@ -58,7 +58,7 @@ class SharedMount extends Mount implements MoveableMount {
* update fileTarget in the database if the mount point changed
* @param string $newPath
* @param array $share reference to the share which should be modified
* @return type
* @return bool
*/
private static function updateFileTarget($newPath, &$share) {
// if the user renames a mount point from a group share we need to create a new db entry
@ -152,9 +152,7 @@ class SharedMount extends Mount implements MoveableMount {
*/
public function removeMount() {
$mountManager = \OC\Files\Filesystem::getMountManager();
/**
* @var \OC\Files\Storage\Shared
*/
/** @var \OC\Files\Storage\Shared */
$storage = $this->getStorage();
$result = $storage->unshareStorage();
$mountManager->removeMount($this->mountPoint);

2
apps/files_sharing/lib/sharedstorage.php
Unescape Escape View File

@ -534,6 +534,8 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
/**
* unshare complete storage, also the grouped shares
*
* @return bool
*/
public function unshareStorage() {
$result = true;

7
lib/private/share/share.php
Unescape Escape View File

@ -340,7 +340,7 @@ class Share extends \OC\Share\Constants {
* @param mixed $parameters
* @param boolean $includeCollections
* @param string $shareWith (optional) define against which user should be checked, default: current user
* @return mixed Return depends on format
* @return array
*/
public static function getItemSharedWithBySource($itemType, $itemSource, $format = self::FORMAT_NONE,
$parameters = null, $includeCollections = false, $shareWith = null) {
@ -1576,11 +1576,6 @@ class Share extends \OC\Share\Constants {
$queriesToExecute = array();
$fileShare = false;
if ($itemType === 'file' || $itemType === 'folder') {
$fileShare = true;
}
$result = self::checkReshare($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $itemSourceName, $expirationDate);
if(!empty($result)) {
$parent = $result['parent'];

2
lib/public/share.php
Unescape Escape View File

@ -139,7 +139,7 @@ class Share extends \OC\Share\Constants {
* @param int $format (optional) Format type must be defined by the backend
* @param mixed $parameters
* @param bool $includeCollections
* @return mixed Return depends on format
* @return array
*/
public static function getItemSharedWithBySource($itemType, $itemSource, $format = self::FORMAT_NONE,
$parameters = null, $includeCollections = false) {