fixed merge conflicts

helios-ag · Mar 21, 2015 · f70c746 · f70c746
2 parents 9ad6323 + 7e575d4
commit f70c746
Show file tree

Hide file tree

Showing 3 changed files with 247 additions and 305 deletions.
diff --git a/Configuration/ElFinderConfigurationReader.php b/Configuration/ElFinderConfigurationReader.php
@@ -149,8 +149,8 @@ private function getURL($parameter, $request, $homeFolder, $path)
     {
         return isset($parameter['url']) && $parameter['url']
             ? strpos($parameter['url'], 'http') === 0
-            ? $parameter['url']
-            : sprintf('%s://%s%s/%s/%s', $request->getScheme(), $request->getHttpHost(), $request->getBasePath(), $parameter['url'], $homeFolder)
+                ? $parameter['url']
+                : sprintf('%s://%s%s/%s/%s', $request->getScheme(), $request->getHttpHost(), $request->getBasePath(), $parameter['url'], $homeFolder)
             : sprintf('%s://%s%s/%s/%s', $request->getScheme(), $request->getHttpHost(), $request->getBasePath(), $path, $homeFolder);
     }