diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-26 21:31:15 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-26 21:31:15 +0200 |
| commit | a995e81686cd1255d8f43e13026f43d814dd64f4 (patch) | |
| tree | d0ef4065dec033922bfd0c751d8d84470d279fff /lib/public | |
| parent | 38f9df429397619482e3e3f7ffb0db5274222e4c (diff) | |
| parent | 7d141656ee837199f58d6a29033ded7d5c2a4632 (diff) | |
| download | nextcloud-server-a995e81686cd1255d8f43e13026f43d814dd64f4.tar.gz nextcloud-server-a995e81686cd1255d8f43e13026f43d814dd64f4.zip | |
Merge branch 'master' into appframework-master
Diffstat (limited to 'lib/public')
| -rw-r--r-- | lib/public/groupinterface.php | 2 | ||||
| -rw-r--r-- | lib/public/share.php | 16 | ||||
| -rw-r--r-- | lib/public/userinterface.php | 2 | ||||
| -rw-r--r-- | lib/public/util.php | 8 |
4 files changed, 20 insertions, 8 deletions
diff --git a/lib/public/groupinterface.php b/lib/public/groupinterface.php index 97833028118..5603faa8265 100644 --- a/lib/public/groupinterface.php +++ b/lib/public/groupinterface.php @@ -28,4 +28,4 @@ namespace OCP; -interface GroupInterface extends \OC_Group_Interface {}
\ No newline at end of file +interface GroupInterface extends \OC_Group_Interface {} diff --git a/lib/public/share.php b/lib/public/share.php index 63645e6fa34..b38208bc67f 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -209,7 +209,7 @@ class Share { } } } - + // let's get the parent for the next round $meta = $cache->get((int)$source); if($meta !== false) { @@ -840,7 +840,11 @@ class Share { // Get filesystem root to add it to the file target and remove from the // file source, match file_source with the file cache if ($itemType == 'file' || $itemType == 'folder') { - $root = \OC\Files\Filesystem::getRoot(); + if(!is_null($uidOwner)) { + $root = \OC\Files\Filesystem::getRoot(); + } else { + $root = ''; + } $where = 'INNER JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid`'; if (!isset($item)) { $where .= ' WHERE `file_target` IS NOT NULL'; @@ -1303,11 +1307,11 @@ class Share { 'run' => &$run, 'error' => &$error )); - + if ($run === false) { throw new \Exception($error); } - + if (isset($fileSource)) { if ($parentFolder) { if ($parentFolder === true) { @@ -1398,11 +1402,11 @@ class Share { 'run' => &$run, 'error' => &$error )); - + if ($run === false) { throw new \Exception($error); } - + if (isset($fileSource)) { if ($parentFolder) { if ($parentFolder === true) { diff --git a/lib/public/userinterface.php b/lib/public/userinterface.php index b73a8f8d8b0..53d9faf7a5e 100644 --- a/lib/public/userinterface.php +++ b/lib/public/userinterface.php @@ -28,4 +28,4 @@ namespace OCP; -interface UserInterface extends \OC_User_Interface {}
\ No newline at end of file +interface UserInterface extends \OC_User_Interface {} diff --git a/lib/public/util.php b/lib/public/util.php index 693805946ea..b33f07b55e6 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -123,6 +123,14 @@ class Util { } /** + * @brief check if some encrypted files are stored + * @return bool + */ + public static function encryptedFiles() { + return \OC_Util::encryptedFiles(); + } + + /** * @brief Creates an absolute url * @param string $app app * @param string $file file |