diff --git a/composer-dist.json b/composer-dist.json index 10fe5da3c..28b02b12b 100644 --- a/composer-dist.json +++ b/composer-dist.json @@ -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 + } + } + ] + } diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index e5e96563e..534e9e653 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -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()) { diff --git a/inc/inc.Init.php b/inc/inc.Init.php index 69ed0c6a4..1b4aaba5a 100644 --- a/inc/inc.Init.php +++ b/inc/inc.Init.php @@ -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();