From 67c5c90943503f1f1116d710a95464bd2d8e15d8 Mon Sep 17 00:00:00 2001 From: Bianka Martinovic Date: Mon, 14 Feb 2022 10:44:54 +0100 Subject: [PATCH] Update upgrade.php --- upgrade.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/upgrade.php b/upgrade.php index bed3f09..74a937e 100644 --- a/upgrade.php +++ b/upgrade.php @@ -278,13 +278,17 @@ function scandir($directory, $sorting_order = 0) // install the droplet(s) if(!defined('CAT_PATH')) { try { - include WB_PATH.'/modules/droplets/functions.inc.php'; - make_dir(WB_PATH.'/temp/unzip'); - wbce_unpack_and_import(WB_PATH.'/modules/news_img/droplets/droplet_getNewsItems.zip', WB_PATH . '/temp/unzip/'); - rm_full_dir(WB_PATH.'/temp/unzip'); + // workaround for problem with global $module_directory overwritten + // by functions.inc.php here + $orig_module_dir = $module_directory; + include WB_PATH.'/modules/droplets/functions.inc.php'; + make_dir(WB_PATH.'/temp/unzip'); + wbce_unpack_and_import(WB_PATH.'/modules/news_img/droplets/droplet_getNewsItems.zip', WB_PATH . '/temp/unzip/'); + rm_full_dir(WB_PATH.'/temp/unzip'); + $module_directory = $orig_module_dir; } catch ( \Exception $e ) {} } else { CAT_Helper_Droplet::installDroplet(WB_PATH.'/modules/news_img/droplets/droplet_getNewsItems.zip'); } -} \ No newline at end of file +}