FIX: S3 driver does not handle minisite path correctly

pydio · Jun 30, 2014 · ebe238b · ebe238b
1 parent 14cdc03
commit ebe238b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/core/src/plugins/access.s3/class.s3AccessDriver.php b/core/src/plugins/access.s3/class.s3AccessDriver.php
@@ -64,7 +64,6 @@ public function initRepository()
             $this->driverConf = array();
         }
 
-        $path = $this->repository->getOption("PATH");
         $recycle = $this->repository->getOption("RECYCLE_BIN");
         ConfService::setConf("PROBE_REAL_SIZE", false);
         $wrapperData = $this->detectStreamWrapper(true);

diff --git a/core/src/plugins/access.s3/class.s3AccessWrapper.php b/core/src/plugins/access.s3/class.s3AccessWrapper.php
@@ -49,7 +49,11 @@ protected static function initPath($path, $streamType, $storeOpenContext = false
             self::$lastException = $e;
             throw $e;
         }
+        $basePath = $repoObject->getOption("PATH");
         $baseContainer = $repoObject->getOption("CONTAINER");
+        if(!empty($basePath)){
+            $baseContainer.=rtrim($basePath, "/");
+        }
         $p = "s3://".$baseContainer.str_replace("//", "/", $url["path"]);
         return $p;
     }