From cdb07748cbb7e2a8b97d40c087fafb86589238f7 Mon Sep 17 00:00:00 2001 From: Jean-Christian Denis Date: Sat, 10 Dec 2022 15:45:30 +0100 Subject: [PATCH] use dotclear method to check version --- _install.php | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/_install.php b/_install.php index 5d963e2..90bec2f 100644 --- a/_install.php +++ b/_install.php @@ -64,33 +64,18 @@ $mod_conf = [ # -- Nothing to change below -- try { - # Grab info - $mod_id = basename(__DIR__); - $dc_min = dcCore::app()->plugins->moduleInfo($mod_id, 'requires')[0][1]; - # Check module version - if (version_compare( - dcCore::app()->getVersion($mod_id), - dcCore::app()->plugins->moduleInfo($mod_id, 'version'), - '>=' + if (!dcCore::app()->newVersion( + basename(__DIR__), + dcCore::app()->plugins->moduleInfo(basename(__DIR__), 'version') )) { return null; } - # Check Dotclear version - if (!method_exists('dcUtils', 'versionsCompare') - || dcUtils::versionsCompare(DC_VERSION, $dc_min, '<', false)) { - throw new Exception(sprintf( - '%s requires Dotclear %s', - $mod_id, - $dc_min - )); - } - # Set module settings - dcCore::app()->blog->settings->addNamespace($mod_id); + dcCore::app()->blog->settings->addNamespace(basename(__DIR__)); foreach ($mod_conf as $v) { - dcCore::app()->blog->settings->{$mod_id}->put( + dcCore::app()->blog->settings->__get(basename(__DIR__))->put( $v[0], $v[2], $v[3],