diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-22 22:59:09 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-22 22:59:09 +0100 |
| commit | 9898ba4daf1acdead2ed5fa6024e779caafb353e (patch) | |
| tree | 3fc02fea4997344c73e0bc5ac7bdfc5616d7a7df /apps/files_sharing/lib/sharedstorage.php | |
| parent | 5062ae250b767867609f64c29ab4cde65f022b75 (diff) | |
| parent | 78fce834058a38a7dbcc5310e16095c743434bc6 (diff) | |
| download | nextcloud-server-9898ba4daf1acdead2ed5fa6024e779caafb353e.tar.gz nextcloud-server-9898ba4daf1acdead2ed5fa6024e779caafb353e.zip | |
Merge branch 'master' into master-sqlserver
Conflicts:
core/templates/installation.php
Diffstat (limited to 'apps/files_sharing/lib/sharedstorage.php')
| -rw-r--r-- | apps/files_sharing/lib/sharedstorage.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 65812b7e2fd..c7521949da1 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -240,7 +240,8 @@ class Shared extends \OC\Files\Storage\Common { public function file_put_contents($path, $data) { if ($source = $this->getSourcePath($path)) { // Check if permission is granted - if (($this->file_exists($path) && !$this->isUpdatable($path)) || ($this->is_dir($path) && !$this->isCreatable($path))) { + if (($this->file_exists($path) && !$this->isUpdatable($path)) + || ($this->is_dir($path) && !$this->isCreatable($path))) { return false; } $info = array( @@ -390,9 +391,12 @@ class Shared extends \OC\Files\Storage\Common { } public static function setup($options) { - if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user'] || \OCP\Share::getItemsSharedWith('file')) { + if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user'] + || \OCP\Share::getItemsSharedWith('file')) { $user_dir = $options['user_dir']; - \OC\Files\Filesystem::mount('\OC\Files\Storage\Shared', array('sharedFolder' => '/Shared'), $user_dir.'/Shared/'); + \OC\Files\Filesystem::mount('\OC\Files\Storage\Shared', + array('sharedFolder' => '/Shared'), + $user_dir.'/Shared/'); } } |