gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-11-27 18:10:42 +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-10-22 17:11:45 +02:00
commit 53f74672a4
4 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -349,6 +349,7 @@
- memcached support can be configured (still rarely used) - memcached support can be configured (still rarely used)
- fix folder parameter passed to hook 'folderRowAction' - fix folder parameter passed to hook 'folderRowAction'
- require unrestricted access on document/folder for deletion by rest api - require unrestricted access on document/folder for deletion by rest api
- use php-cache instead of native memcached
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.41 Changes in version 5.1.41

21
composer-dist.json
View File

@ -13,6 +13,9 @@
"config": { "config": {
"platform": { "platform": {
"php": "8.2" "php": "8.2"
},
"allow-plugins": {
"wikimedia/composer-merge-plugin": true
} }
}, },
"require": { "require": {
@ -46,11 +49,27 @@
"seeddms/lucene": "dev-master", "seeddms/lucene": "dev-master",
"seeddms/preview": "dev-master", "seeddms/preview": "dev-master",
"seeddms/sqlitefts": "dev-master", "seeddms/sqlitefts": "dev-master",
"seeddms/http_webdav_server": "dev-master" "seeddms/http_webdav_server": "dev-master",
"wikimedia/composer-merge-plugin": "dev-master",
"cache/memcached-adapter": "^1.2"
}, },
"require-dev": { "require-dev": {
"composer/composer": "dev-main" "composer/composer": "dev-main"
}, },
"extra": {
"merge-plugin": {
"include": [
"composer.local.json"
],
"recurse": false,
"replace": true,
"ignore-duplicates": true,
"merge-dev": true,
"merge-extra": false,
"merge-extra-deep": false,
"merge-scripts": true
}
},
"repositories": [ "repositories": [
{ {
"type": "path", "type": "path",

8
composer.json
View File

@ -52,7 +52,9 @@
"seeddms/lucene": "dev-master", "seeddms/lucene": "dev-master",
"seeddms/preview": "dev-master", "seeddms/preview": "dev-master",
"seeddms/sqlitefts": "dev-master", "seeddms/sqlitefts": "dev-master",
"seeddms/http_webdav_server": "dev-master" "seeddms/http_webdav_server": "dev-master",
"wikimedia/composer-merge-plugin": "dev-master",
"cache/memcached-adapter": "^1.2"
}, },
"require-dev": { "require-dev": {
"composer/composer": "dev-main", "composer/composer": "dev-main",
@ -110,9 +112,9 @@
"include": [ "include": [
"composer.local.json" "composer.local.json"
], ],
"recurse": true, "recurse": false,
"replace": true, "replace": true,
"ignore-duplicates": false, "ignore-duplicates": true,
"merge-dev": true, "merge-dev": true,
"merge-extra": false, "merge-extra": false,
"merge-extra-deep": false, "merge-extra-deep": false,

7
inc/inc.DBInit.php
View File

@ -58,11 +58,12 @@ $dms = new SeedDMS_Core_DMS($db, $storage ? $storage : $settings->_contentDir.$s
$memcache = null; $memcache = null;
if($settings->_enableMemcached && extension_loaded('memcached')) { if($settings->_enableMemcached && extension_loaded('memcached')) {
$memcache = new Memcached('seeddms'); $mc = new Memcached('seeddms');
$memcache->addServers(array( $mc->addServers(array(
array($settings->_memcachedHost ?? 'localhost', $settings->_memcachedPort ?? 11211), array($settings->_memcachedHost ?? 'localhost', $settings->_memcachedPort ?? 11211),
)); ));
$dms->setMemcache($memcache); $memcache = new \Cache\Adapter\Memcached\MemcachedCachePool($mc);
$dms->setCache($memcache);
} }
if(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) { if(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) {