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

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !49
parents 5c32dc46 0c02a447
No related branches found
No related tags found
1 merge request!49Merging develop into main
Pipeline #709466 passed
......@@ -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 . '/' . $link), 3, -1);
$rel = substr($fs->makePathRelative($file, $projectRoot . '/' . $def['link']), 3, -1);
$fs->symlink($rel, $link);
}
}
......
......@@ -25,6 +25,8 @@ $databases = array(
'host' => 'mariadb',
'port' => '3306',
'prefix' => '',
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_general_ci',
'init_commands' => [
'isolation_level' => 'SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED',
],
......@@ -53,6 +55,8 @@ $databases = array(
'password' => 'drupal',
'database' => 'drupal',
'prefix' => '',
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_general_ci',
'init_commands' => [
'isolation_level' => 'SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED',
],
......
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