Fixed getAbsolutePath case when path is "0"

Make sure to correctly check for string emptiness when the passed path
is "0".

Backport of bab8c1f from master
remotes/origin/stable6
Vincent Petry 12 years ago
parent 1e6b4576c2
commit 0c355cb1fb
  1. 2
      lib/private/files/view.php
  2. 18
      tests/lib/files/view.php

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

@ -578,4 +578,22 @@ class View extends \PHPUnit_Framework_TestCase {
$info2 = $view->getFileInfo('/test/test');
$this->assertEquals($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…
Cancel
Save