diff options
author | Vincent Petry <pvince81@owncloud.com> | 2014-05-13 16:17:51 +0400 |
---|---|---|
committer | Vincent Petry <pvince81@owncloud.com> | 2014-05-13 23:17:33 +0400 |
commit | 0c355cb1fb364ac8e31c15ebf601552eb1908664 (patch) | |
tree | f80854e6bf992721af14d5ee64cf1c631d17ff09 | |
parent | 1e6b4576c2a99290f78b48a45c317a8b262d649f (diff) |
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
-rw-r--r-- | lib/private/files/view.php | 2 | ||||
-rw-r--r-- | tests/lib/files/view.php | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 8309dab978b..ca9c47bb4a8 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -35,7 +35,7 @@ class View { } public function getAbsolutePath($path = '/') { - if (!$path) { + if ($path === '') { $path = '/'; } if ($path[0] !== '/') { diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php index d793aebffab..c26c6f29fc0 100644 --- a/tests/lib/files/view.php +++ b/tests/lib/files/view.php @@ -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'), + ); + } } |