From 0d5ba3bc1e435626aede7d144ed1702dcf45a28c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 7 Jun 2021 21:15:18 +0200 Subject: [PATCH] pass $logger to migrate() --- inc/inc.ClassExtensionMgr.php | 4 ++-- op/op.ExtensionMgr.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php index a5a308c57..d098ad4d3 100644 --- a/inc/inc.ClassExtensionMgr.php +++ b/inc/inc.ClassExtensionMgr.php @@ -304,7 +304,7 @@ class SeedDMS_Extension_Mgr { * @param SeedDMS_Core_DMS $dms * @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])) return false; $extconf = $this->extconf[$extname]; @@ -313,7 +313,7 @@ class SeedDMS_Extension_Mgr { $classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file']; if(file_exists($classfile)) { require_once($classfile); - $obj = new $extconf['class']['name']($settings, $dms); + $obj = new $extconf['class']['name']($settings, $dms, $logger); if(method_exists($obj, 'migrate')) $ret = $obj->migrate(); } diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php index 0ef4dd3f0..528b6aa66 100644 --- a/op/op.ExtensionMgr.php +++ b/op/op.ExtensionMgr.php @@ -145,7 +145,7 @@ elseif ($action == "toggle") { /* {{{ */ if($settings->extensionIsDisabled($extname)) echo json_encode(array('success'=>true, 'msg'=>getMLText('extension_is_off_now'))); else { - $ret = $extMgr->migrate($extname, $settings, $dms); + $ret = $extMgr->migrate($extname, $settings, $dms, $logger); if($ret !== null) { if($ret === true) echo json_encode(array('success'=>true, 'msg'=>getMLText('extension_migration_success')));