[Pkg-owncloud-commits] [owncloud] 14/85: Fixed getAbsolutePath case when path is "0"

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch 6.0
in repository owncloud.

commit 0c355cb1fb364ac8e31c15ebf601552eb1908664
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Tue May 13 14:17:51 2014 +0200

    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
---
 lib/private/files/view.php |  2 +-
 tests/lib/files/view.php   | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 8309dab..ca9c47b 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 d793aeb..c26c6f2 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'),
+		);
+	}
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git