gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-09 13:06:14 +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 2023-01-20 12:22:22 +01:00
commit c3e415ff7a
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
composer-dist.json
View File

@ -18,6 +18,17 @@
"alecrabbit/php-console-colour": "*", "alecrabbit/php-console-colour": "*",
"dragonmantank/cron-expression": "^2.2", "dragonmantank/cron-expression": "^2.2",
"zf1/zend-search-lucene": "*", "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
} }
} }
]
}

2
inc/inc.ClassSettings.php
View File

@ -1562,7 +1562,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/SeedDMS/Core.php'); require_once($this->_rootDir.'../pear/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()) {

2
inc/inc.Init.php
View File

@ -23,6 +23,6 @@ use Symfony\Component\HttpFoundation\Request;
if(!empty($settings->_coreDir)) if(!empty($settings->_coreDir))
require_once($settings->_coreDir.'/Core.php'); require_once($settings->_coreDir.'/Core.php');
else else
require_once('SeedDMS/Core.php'); require_once('vendor/seeddms/core/Core.php');
$request = Request::createFromGlobals(); $request = Request::createFromGlobals();