mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-08 20:46:05 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
c3e415ff7a
|
@ -18,6 +18,17 @@
|
|||
"alecrabbit/php-console-colour": "*",
|
||||
"dragonmantank/cron-expression": "^2.2",
|
||||
"zf1/zend-search-lucene": "*",
|
||||
"symfony/http-foundation": "^5.4"
|
||||
}
|
||||
"symfony/http-foundation": "^5.4",
|
||||
"seeddms/core": "dev-master"
|
||||
},
|
||||
"repositories": [
|
||||
{
|
||||
"type": "path",
|
||||
"url": "/home/cvs/seeddms/SeedDMS_Core",
|
||||
"options": {
|
||||
"symlink": false
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
}
|
||||
|
|
|
@ -1562,7 +1562,7 @@ class Settings { /* {{{ */
|
|||
if(!empty($this->_coreDir))
|
||||
require_once($this->_coreDir.'/Core.php');
|
||||
else
|
||||
require_once($this->_rootDir.'../pear/SeedDMS/Core.php');
|
||||
require_once($this->_rootDir.'../pear/vendor/seeddms/core/Core.php');
|
||||
$tmpcore = new SeedDMS_Core_DMS(null, $this->_contentDir);
|
||||
$db = new SeedDMS_Core_DatabaseAccess($this->_dbDriver, $this->_dbHostname, $this->_dbUser, $this->_dbPass, $this->_dbDatabase);
|
||||
if(!$db->connect()) {
|
||||
|
|
|
@ -23,6 +23,6 @@ use Symfony\Component\HttpFoundation\Request;
|
|||
if(!empty($settings->_coreDir))
|
||||
require_once($settings->_coreDir.'/Core.php');
|
||||
else
|
||||
require_once('SeedDMS/Core.php');
|
||||
require_once('vendor/seeddms/core/Core.php');
|
||||
|
||||
$request = Request::createFromGlobals();
|
||||
|
|
Loading…
Reference in New Issue
Block a user