Browse Source

Fixed getAbsolutePath case when path is "0"

Make sure to correctly check for string emptiness when the passed path
is "0".
tags/v7.0.0alpha2
Vincent Petry 10 years ago
parent
commit
bab8c1f8e5
2 changed files with 19 additions and 1 deletions
  1. 1
    1
      lib/private/files/view.php
  2. 18
    0
      tests/lib/files/view.php

+ 1
- 1
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
- 0
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'),
);
}
}

Loading…
Cancel
Save