summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-05-27 14:24:35 +0200
committerRobin Appelman <icewind@owncloud.com>2014-06-06 09:55:59 +0200
commitdea5219244b5d931db102b02d95e72f784eec7d1 (patch)
tree3e38e701a637104f5cebe53493445ec2c776cea1
parentbf5e9357fc5dacc0bc951e7c60fe7105533a56fb (diff)
downloadnextcloud-server-dea5219244b5d931db102b02d95e72f784eec7d1.tar.gz
nextcloud-server-dea5219244b5d931db102b02d95e72f784eec7d1.zip
Fix folder name for storage root
-rw-r--r--apps/files/lib/helper.php2
-rw-r--r--lib/private/files/fileinfo.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index 7d8906e2251..b84b6c06d30 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -113,7 +113,7 @@ class Helper
if (\OC::$server->getPreviewManager()->isMimeSupported($i['mimetype'])) {
$entry['isPreviewAvailable'] = true;
}
- $entry['name'] = $i['name'];
+ $entry['name'] = $i->getName();
$entry['permissions'] = $i['permissions'];
$entry['mimetype'] = $i['mimetype'];
$entry['size'] = $i['size'];
diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php
index e7afeb4ccce..d012c0c5a63 100644
--- a/lib/private/files/fileinfo.php
+++ b/lib/private/files/fileinfo.php
@@ -108,7 +108,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
* @return string
*/
public function getName() {
- return $this->data['name'];
+ return basename($this->getPath());
}
/**