File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed
Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff 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 }
You can’t perform that action at this time.
0 commit comments