gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-18 02:59:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uwe Steinmann 2022-06-10 08:53:18 +02:00
commit 8bc93eac03
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/inc.ClassSettings.php
View File

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