From 88874155b02606feed47d515446f02a5d1536e62 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Jan 2023 12:09:45 +0100 Subject: [PATCH 1/2] add seeddms/core --- composer-dist.json | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/composer-dist.json b/composer-dist.json index 7c0171634..1c69d8361 100644 --- a/composer-dist.json +++ b/composer-dist.json @@ -12,6 +12,17 @@ "pear/db": "*", "alecrabbit/php-console-colour": "*", "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 + } + } + ] + } From 9df57ebe675e382371f0958257ff9ecaa28383b6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 20 Jan 2023 12:21:14 +0100 Subject: [PATCH 2/2] no longer include Core.php from SeedDMS, use vendor/seeddms/core instead --- inc/inc.ClassSettings.php | 2 +- inc/inc.Init.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 9e65b2f8c..e695242fc 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -1479,7 +1479,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();