Merge remote-tracking branch 'rafalwrzeszcz/feature-basepath-fix'

zendframework · Jan 2, 2012 · efd54b7 · efd54b7
7 parents 14c7cd8 + 5a55cdf + c9e475e + 1fa3bfc + 3a78ba4 + a774960 + b7f196c
commit efd54b7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Helper/BasePath.php b/src/Helper/BasePath.php
@@ -58,7 +58,7 @@ public function __invoke($file = null)
         }
 
         if (null !== $file) {
-            $file = '/' . ltrim($file, '/');
+            $file = ltrim($file, '/');
         }
 
         return $this->basePath . $file;
@@ -72,7 +72,7 @@ public function __invoke($file = null)
      */
     public function setBasePath($basePath)
     {
-        $this->basePath = $basePath;
+        $this->basePath = rtrim($basePath, '/') . '/';
         return $this;
     }
 }