Merge pull request #8572 from owncloud/core-getabsolutepathwithzero
Fixed getAbsolutePath case when path is "0"
This commit is contained in:
commit
f5bc680f9c
|
@ -37,7 +37,7 @@ class View {
|
|||
}
|
||||
|
||||
public function getAbsolutePath($path = '/') {
|
||||
if (!$path) {
|
||||
if ($path === '') {
|
||||
$path = '/';
|
||||
}
|
||||
if ($path[0] !== '/') {
|
||||
|
|
|
@ -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'),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue