gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-09 13:06:14 +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 2021-06-07 21:15:48 +02:00
commit 74292d9304
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/inc.ClassExtensionMgr.php
View File

@ -308,7 +308,7 @@ class SeedDMS_Extension_Mgr {
* @param SeedDMS_Core_DMS $dms * @param SeedDMS_Core_DMS $dms
* @return boolean true on success, false on error * @return boolean true on success, false on error
*/ */
public function migrate($extname, $settings, $dms) { /* {{{ */ public function migrate($extname, $settings, $dms, $logger) { /* {{{ */
if(!isset($this->extconf[$extname])) if(!isset($this->extconf[$extname]))
return false; return false;
$extconf = $this->extconf[$extname]; $extconf = $this->extconf[$extname];
@ -317,7 +317,7 @@ class SeedDMS_Extension_Mgr {
$classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file']; $classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file'];
if(file_exists($classfile)) { if(file_exists($classfile)) {
require_once($classfile); require_once($classfile);
$obj = new $extconf['class']['name']($settings, $dms); $obj = new $extconf['class']['name']($settings, $dms, $logger);
if(method_exists($obj, 'migrate')) if(method_exists($obj, 'migrate'))
$ret = $obj->migrate(); $ret = $obj->migrate();
} }

2
op/op.ExtensionMgr.php
View File

@ -145,7 +145,7 @@ elseif ($action == "toggle") { /* {{{ */
if($settings->extensionIsDisabled($extname)) if($settings->extensionIsDisabled($extname))
echo json_encode(array('success'=>true, 'msg'=>getMLText('extension_is_off_now'))); echo json_encode(array('success'=>true, 'msg'=>getMLText('extension_is_off_now')));
else { else {
$ret = $extMgr->migrate($extname, $settings, $dms); $ret = $extMgr->migrate($extname, $settings, $dms, $logger);
if($ret !== null) { if($ret !== null) {
if($ret === true) if($ret === true)
echo json_encode(array('success'=>true, 'msg'=>getMLText('extension_migration_success'))); echo json_encode(array('success'=>true, 'msg'=>getMLText('extension_migration_success')));