gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2026-01-13 21:06:43 +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 2025-12-17 08:32:17 +01:00
commit 6c754cee68
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -356,6 +356,7 @@
--------------------------------------------------------------------------------
Changes in version 5.1.44
--------------------------------------------------------------------------------
- fix php error in install tool
--------------------------------------------------------------------------------
Changes in version 5.1.43

4
inc/inc.Settings.php
View File

@ -78,8 +78,6 @@ if(isset($settings->_maxExecutionTime)) {
*/
ini_set('include_path', $settings->_rootDir. PATH_SEPARATOR .ini_get('include_path'));
/* composer is installed in vendor directory, but install tool does not need it */
if(!defined("SEEDDMS_INSTALL"))
require_once 'vendor/autoload.php';
require_once 'vendor/autoload.php';
require_once "inc.Version.php";

1
install/install.php
View File

@ -62,6 +62,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
/**
* Load default settings + set
*/
require_once '../vendor/autoload.php';
require_once('../inc/inc.Version.php');
$ver = new SeedDMS_Version();
define("SEEDDMS_INSTALL", "on");