mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-11-27 10:00:41 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
26732f8300
|
|
@ -1699,7 +1699,7 @@ class Settings { /* {{{ */
|
||||||
if(!empty($this->_coreDir))
|
if(!empty($this->_coreDir))
|
||||||
require_once($this->_coreDir.'/Core.php');
|
require_once($this->_coreDir.'/Core.php');
|
||||||
else
|
else
|
||||||
require_once($this->_rootDir.'../pear/vendor/seeddms/core/Core.php');
|
require_once($this->_rootDir.'../vendor/seeddms/core/Core.php');
|
||||||
$tmpcore = new SeedDMS_Core_DMS(null, $this->_contentDir);
|
$tmpcore = new SeedDMS_Core_DMS(null, $this->_contentDir);
|
||||||
$db = new SeedDMS_Core_DatabaseAccess($this->_dbDriver, $this->_dbHostname, $this->_dbUser, $this->_dbPass, $this->_dbDatabase);
|
$db = new SeedDMS_Core_DatabaseAccess($this->_dbDriver, $this->_dbHostname, $this->_dbUser, $this->_dbPass, $this->_dbDatabase);
|
||||||
if(!$db->connect()) {
|
if(!$db->connect()) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user