diff options
author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-17 09:41:37 +0100 |
---|---|---|
committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-17 09:41:37 +0100 |
commit | 325746ae45506dad6003f55fe951243be9db3c77 (patch) | |
tree | 526975163d93bce4b3cecd389ad9a6649769cfed /lib/files/filesystem.php | |
parent | 808a13922c8bc002e697f3bbe84be70a2c715cf6 (diff) | |
parent | 0f8058cb12ed97dba45ab8b2f48b7321662bbd2e (diff) | |
download | nextcloud-server-325746ae45506dad6003f55fe951243be9db3c77.tar.gz nextcloud-server-325746ae45506dad6003f55fe951243be9db3c77.zip |
Merge branch 'master' into fix-googledrive
Diffstat (limited to 'lib/files/filesystem.php')
-rw-r--r-- | lib/files/filesystem.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php index a0c3c4b9b75..f4530868077 100644 --- a/lib/files/filesystem.php +++ b/lib/files/filesystem.php @@ -135,7 +135,9 @@ class Filesystem { /** * get the mountpoint of the storage object for a path - ( note: because a storage is not always mounted inside the fakeroot, the returned mountpoint is relative to the absolute root of the filesystem and doesn't take the chroot into account + * ( note: because a storage is not always mounted inside the fakeroot, the + * returned mountpoint is relative to the absolute root of the filesystem + * and doesn't take the chroot into account ) * * @param string $path * @return string @@ -318,7 +320,8 @@ class Filesystem { /** * return the path to a local version of the file - * we need this because we can't know if a file is stored local or not from outside the filestorage and for some purposes a local file is needed + * we need this because we can't know if a file is stored local or not from + * outside the filestorage and for some purposes a local file is needed * * @param string $path * @return string |