|
@@ -1677,7 +1677,7 @@ class SiteController extends ActionController
|
|
|
|
|
|
|
|
// try to filter by directory name
|
|
// try to filter by directory name
|
|
|
foreach ($candidates as $subdir) {
|
|
foreach ($candidates as $subdir) {
|
|
|
- if (preg_match('/\.*_' . $organizationId . '$/', $subdir)) {
|
|
|
|
|
|
|
+ if (preg_match('/\.*_' . $rootUid . '$/', $subdir)) {
|
|
|
$filename = $configs_directory . $subdir . '/config.yaml';
|
|
$filename = $configs_directory . $subdir . '/config.yaml';
|
|
|
$yamlConfig = Yaml::parseFile($filename);
|
|
$yamlConfig = Yaml::parseFile($filename);
|
|
|
|
|
|
|
@@ -1689,6 +1689,7 @@ class SiteController extends ActionController
|
|
|
|
|
|
|
|
// it wasn't found the easy way, let's look to each file... :(
|
|
// it wasn't found the easy way, let's look to each file... :(
|
|
|
foreach ($candidates as $subdir) {
|
|
foreach ($candidates as $subdir) {
|
|
|
|
|
+ $filename = $configs_directory . $subdir . '/config.yaml';
|
|
|
$yamlConfig = Yaml::parseFile($filename);
|
|
$yamlConfig = Yaml::parseFile($filename);
|
|
|
if ($yamlConfig['rootPageId'] === $rootUid) {
|
|
if ($yamlConfig['rootPageId'] === $rootUid) {
|
|
|
return [$filename, $yamlConfig];
|
|
return [$filename, $yamlConfig];
|