Skip to content
Snippets Groups Projects
Commit 2dc63981 authored by jurgenhaas's avatar jurgenhaas
Browse files

Undo previous fix and resolve problem with propper webRoot calculation

parent 0c02a447
No related branches found
No related tags found
1 merge request!50Merging develop into main
Pipeline #709540 passed
This commit is part of merge request !50. Comments created here will be created in the context of that merge request.
......@@ -343,7 +343,7 @@ class Handler extends BaseHandler {
}
$corePath = $installationManager->getInstallPath($drupalCorePackage);
// Directory where Drupal's index.php is located.
$webRoot = dirname($corePath);
$webRoot = basename(dirname($corePath));
}
$this->config->setValue('webRoot', $webRoot, FALSE);
......@@ -426,7 +426,7 @@ class Handler extends BaseHandler {
if (isset($def['link']) && ($def['link'] !== $settingsPath)) {
$link = $def['link'] . '/' . $filename;
if (!$fs->exists($link)) {
$rel = substr($fs->makePathRelative($file, $projectRoot . '/' . $def['link']), 3, -1);
$rel = substr($fs->makePathRelative($file, $projectRoot . '/' . $link), 3, -1);
$fs->symlink($rel, $link);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment