mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8572 from owncloud/core-getabsolutepathwithzero 

Fixed getAbsolutePath case when path is "0"
This commit is contained in:
Thomas Müller 2014-05-13 17:41:18 +02:00
parent 7babd44dd0 bab8c1f8e5
commit f5bc680f9c
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/files/view.php
View File

@ -37,7 +37,7 @@ class View {
}
public function getAbsolutePath($path = '/') {
if (!$path) {
if ($path === '') {
$path = '/';
}
if ($path[0] !== '/') {

18
tests/lib/files/view.php
View File

@ -585,4 +585,22 @@ class View extends \PHPUnit_Framework_TestCase {
$info2 = $view->getFileInfo('/test/test');
$this->assertSame($info['etag'], $info2['etag']);
}
/**
* @dataProvider absolutePathProvider
*/
public function testGetAbsolutePath($expectedPath, $relativePath) {
$view = new \OC\Files\View('/files');
$this->assertEquals($expectedPath, $view->getAbsolutePath($relativePath));
}
function absolutePathProvider() {
return array(
array('/files/', ''),
array('/files/0', '0'),
array('/files/', '/'),
array('/files/test', 'test'),
array('/files/test', '/test'),
);
}
}