diff options
| author | icewind1991 <robin@icewind.nl> | 2014-06-06 11:57:43 +0200 |
|---|---|---|
| committer | icewind1991 <robin@icewind.nl> | 2014-06-06 11:57:43 +0200 |
| commit | c47d4ebbac7885ad91cf56355bd6aa09318ff8e8 (patch) | |
| tree | 22a78530feb3c582cf5624b4089bd79c8e9b2afd /apps/files | |
| parent | 0661d737e6f529b7d921ada441453f2b314c3445 (diff) | |
| parent | 46f70aabfd399e1bc5517b2192ac2489189f9d94 (diff) | |
| download | nextcloud-server-c47d4ebbac7885ad91cf56355bd6aa09318ff8e8.tar.gz nextcloud-server-c47d4ebbac7885ad91cf56355bd6aa09318ff8e8.zip | |
Merge pull request #8666 from owncloud/mount-remove
Support for (re)moving mountpoints
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/lib/helper.php | 2 | ||||
| -rw-r--r-- | apps/files/tests/ajax_rename.php | 2 | ||||
| -rw-r--r-- | apps/files/tests/helper.php | 2 |
3 files changed, 3 insertions, 3 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/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php index 9928053e501..fed366aa8eb 100644 --- a/apps/files/tests/ajax_rename.php +++ b/apps/files/tests/ajax_rename.php @@ -81,7 +81,7 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase { $this->viewMock->expects($this->any()) ->method('getFileInfo') ->will($this->returnValue(new \OC\Files\FileInfo( - '/', + '/new_name', new \OC\Files\Storage\Local(array('datadir' => '/')), '/', array( diff --git a/apps/files/tests/helper.php b/apps/files/tests/helper.php index 9b3603cd563..f269cc70ed5 100644 --- a/apps/files/tests/helper.php +++ b/apps/files/tests/helper.php @@ -17,7 +17,7 @@ class Test_Files_Helper extends \PHPUnit_Framework_TestCase { private function makeFileInfo($name, $size, $mtime, $isDir = false) { return new \OC\Files\FileInfo( - '/', + '/' . $name, null, '/', array( |