From 189e6da70eeac24e9163a3306f796777bad47107 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 1 Jan 2020 09:24:22 +0100 Subject: [PATCH] better checking for correct version had to be modified because extensions are new disabled in the settings.xml --- inc/inc.Extension.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/inc.Extension.php b/inc/inc.Extension.php index 8e74c0080..5fb009398 100644 --- a/inc/inc.Extension.php +++ b/inc/inc.Extension.php @@ -23,16 +23,15 @@ $version = new SeedDMS_Version; foreach($EXT_CONF as $extname=>$extconf) { if(!$settings->extensionIsDisabled($extname)) { -// if(!isset($extconf['disable']) || $extconf['disable'] == false) { /* check for requirements */ + $disable = false; if(!empty($extconf['constraints']['depends']['seeddms'])) { $t = explode('-', $extconf['constraints']['depends']['seeddms'], 2); if(SeedDMS_Extension_Mgr::cmpVersion($t[0], $version->version()) > 0 || ($t[1] && SeedDMS_Extension_Mgr::cmpVersion($t[1], $version->version()) < 0)) continue; - $extconf['disable'] = true; + $disable = true; } -// } -// if(!isset($extconf['disable']) || $extconf['disable'] == false) { + if(!$disable) { if(isset($extconf['class']) && isset($extconf['class']['file']) && isset($extconf['class']['name'])) { $classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file']; if(file_exists($classfile)) { @@ -57,5 +56,6 @@ foreach($EXT_CONF as $extname=>$extconf) { } } } + } } }