mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-03-12 00:45:34 +00:00
use SEEDDMS_CONFIG_FILE if set
This commit is contained in:
parent
c2d8fb1508
commit
c3ab200c87
|
@ -2,7 +2,7 @@
|
||||||
// MyDMS. Document Management System
|
// MyDMS. Document Management System
|
||||||
// Copyright (C) 2002-2005 Markus Westphal
|
// Copyright (C) 2002-2005 Markus Westphal
|
||||||
// Copyright (C) 2006-2008 Malcolm Cowe
|
// Copyright (C) 2006-2008 Malcolm Cowe
|
||||||
// Copyright (C) 2010 Matteo Lucarelli
|
// Copyright (C) 2010 Matteo Lucarelli
|
||||||
//
|
//
|
||||||
// This program is free software; you can redistribute it and/or modify
|
// This program is free software; you can redistribute it and/or modify
|
||||||
// it under the terms of the GNU General Public License as published by
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
@ -47,7 +47,10 @@ if (file_exists("../inc/inc.Settings.old.php")) {
|
||||||
}
|
}
|
||||||
|
|
||||||
require_once('inc.ClassSettings.php');
|
require_once('inc.ClassSettings.php');
|
||||||
$settings = new Settings();
|
if(defined("SEEDDMS_CONFIG_FILE"))
|
||||||
|
$settings = new Settings(SEEDDMS_CONFIG_FILE);
|
||||||
|
else
|
||||||
|
$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")) {
|
||||||
die("SeedDMS won't run unless your remove the file ENABLE_INSTALL_TOOL from your configuration directory.");
|
die("SeedDMS won't run unless your remove the file ENABLE_INSTALL_TOOL from your configuration directory.");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user