gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-09 21:16:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

extra _extraPath if not empty, add rootDir.'../pear' to include path

Browse Source
This commit is contained in:
Uwe Steinmann 2021-07-23 12:08:26 +02:00
parent e29976bf25
commit 6a72b3c0fa
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
inc/inc.Settings.php
View File

@ -35,11 +35,12 @@ if(!trim($settings->_encryptionKey)) {
$settings->save(); $settings->save();
} }
if(isset($settings->_extraPath)) ini_set('include_path', $settings->_rootDir.'pear'. PATH_SEPARATOR .ini_get('include_path'));
if(!empty($settings->_extraPath)) {
ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path')); ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));
}
/* composer is installed in pear directory */ /* composer is installed in pear directory */
require_once 'vendor/autoload.php'; require_once $settings->_rootDir.'../pear/vendor/autoload.php';
if(isset($settings->_maxExecutionTime)) { if(isset($settings->_maxExecutionTime)) {
if (php_sapi_name() !== "cli") { if (php_sapi_name() !== "cli") {
@ -67,3 +68,7 @@ if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
* relative to it. * relative to it.
*/ */
ini_set('include_path', $settings->_rootDir. PATH_SEPARATOR .ini_get('include_path')); ini_set('include_path', $settings->_rootDir. PATH_SEPARATOR .ini_get('include_path'));
/* Add root Dir.'../pear'. Needed because the SeedDMS_Core, etc. are included
* relative to it.
*/
ini_set('include_path', $settings->_rootDir.'../pear'. PATH_SEPARATOR .ini_get('include_path'));