gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-29 21:17:22 +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 2020-09-30 11:04:52 +02:00
commit c81a2554aa
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -181,6 +181,7 @@
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
- new api to fulltext search - new api to fulltext search
- do offer to export users of group if there are no users - do offer to export users of group if there are no users
- config file can be set in env var SEEDDMS_CONFIG_FILE
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.20 Changes in version 5.1.20

2
inc/inc.Settings.php
View File

@ -21,6 +21,8 @@
require_once('inc.ClassSettings.php'); require_once('inc.ClassSettings.php');
if(defined("SEEDDMS_CONFIG_FILE")) if(defined("SEEDDMS_CONFIG_FILE"))
$settings = new Settings(SEEDDMS_CONFIG_FILE); $settings = new Settings(SEEDDMS_CONFIG_FILE);
elseif(getenv("SEEDDMS_CONFIG_FILE"))
$settings = new Settings(getenv("SEEDDMS_CONFIG_FILE"));
else else
$settings = new Settings(); $settings = new Settings();
if(!defined("SEEDDMS_INSTALL") && file_exists(dirname($settings->_configFilePath)."/ENABLE_INSTALL_TOOL")) { if(!defined("SEEDDMS_INSTALL") && file_exists(dirname($settings->_configFilePath)."/ENABLE_INSTALL_TOOL")) {