Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2022-06-10 08:53:18 +02:00
commit 8bc93eac03

View File

@ -1279,7 +1279,7 @@ class Settings { /* {{{ */
* If none was found a final try will be made checking /etc/seeddms
* @return NULL|string config directory
*/
protected static function getConfigDir() { /* {{{ */
public static function getConfigDir() { /* {{{ */
if(defined("SEEDDMS_CONFIG_FILE"))
return dirname(SEEDDMS_CONFIG_FILE);
elseif(getenv("SEEDDMS_CONFIG_FILE"))