Skip to content

Commit 1903c97

Browse files
committed
fix: It is sufficient to find conf.php in EITHER var/config/ or vendor/horde//config to prevent deactivating the app
1 parent 684874e commit 1903c97

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

lib/Horde/Registry/Registryconfig.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,12 @@ public function __construct($reg_ob)
132132

133133
if (!file_exists($app['fileroot']) ||
134134
(!$reg_ob->isTest() &&
135+
// If a config XML file exists but no conf.php file exists in either $app/config/ or var/config/$app
135136
file_exists($app['fileroot'] . '/config/conf.xml') &&
136-
!file_exists($app['fileroot'] . '/config/conf.php'))) {
137+
(!file_exists($app['fileroot'] . '/config/conf.php') &&
138+
//
139+
!(defined('HORDE_CONFIG_BASE') && file_exists(HORDE_CONFIG_BASE . DIRECTORY_SEPARATOR . $appName . DIRECTORY_SEPARATOR . 'conf.php'))
140+
))) {
137141
$app['status'] = 'inactive';
138142
Horde::log('Setting ' . $appName . ' inactive because the fileroot does not exist or the application is not configured yet.', 'DEBUG');
139143
}

0 commit comments

Comments
 (0)