diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-14 22:54:48 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-14 22:54:48 +0100 |
| commit | 4b80466880b4e2daf25e38d621a0ebac608d335d (patch) | |
| tree | dfdcac5eb81cea7853d16c50ea3043c4642f3c15 /lib/files/filesystem.php | |
| parent | 78a3625ddfc67e7e6743a2ff6fd31e1566b174c8 (diff) | |
| parent | 9058d398a7b9aac58ab4aa7379e13ca83c72281d (diff) | |
| download | nextcloud-server-4b80466880b4e2daf25e38d621a0ebac608d335d.tar.gz nextcloud-server-4b80466880b4e2daf25e38d621a0ebac608d335d.zip | |
Merge branch 'master' into master-sqlserver
Conflicts:
lib/db.php
lib/files/cache/cache.php
lib/files/cache/legacy.php
lib/setup.php
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 |