Merge pull request #1618 from owncloud/mapped-storage-unit-testing-linux-masterv5.0.0alpha1

Mapped storage unit testing linux master

2 files changed, 7 insertions, 2 deletions

diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php
index 9fe01135866..aaa3c0fab49 100644
--- a/lib/files/storage/local.php
+++ b/lib/files/storage/local.php
@@ -9,7 +9,9 @@
 namespace OC\Files\Storage;
 
 if (\OC_Util::runningOnWindows()) {
-	require_once 'mappedlocal.php';
+	class Local extends MappedLocal {
+
+	}
 } else {
 
 /**
diff --git a/lib/files/storage/mappedlocal.php b/lib/files/storage/mappedlocal.php
index 80dd79bc41f..218465d8eef 100644
--- a/lib/files/storage/mappedlocal.php
+++ b/lib/files/storage/mappedlocal.php
@@ -10,7 +10,7 @@ namespace OC\Files\Storage;
 /**
  * for local filestore, we only have to map the paths
  */
-class Local extends \OC\Files\Storage\Common{
+class MappedLocal extends \OC\Files\Storage\Common{
 	protected $datadir;
 	private $mapper;
 
@@ -329,6 +329,9 @@ class Local extends \OC\Files\Storage\Common{
 		if(strpos($path, '/') === 0) {
 			$path = substr($path, 1);
 		}
+		if ($path === false) {
+			return '';
+		}
 
 		return $path;
 	}