NWI rename droplet, update version

WBCE · Jan 31, 2024 · 70f55d4 · 70f55d4
1 parent 34e6d84
commit 70f55d4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/wbce/modules/news_img/droplets/droplet_fetchNewsItems.zip b/wbce/modules/news_img/droplets/droplet_fetchNewsItems.zip
diff --git a/wbce/modules/news_img/info.php b/wbce/modules/news_img/info.php
@@ -16,17 +16,21 @@
 $module_directory   = 'news_img';
 $module_name        = 'News with Images';
 $module_function    = 'page';
-$module_version     = '5.0.24';
+$module_version     = '5.0.25';
 $module_platform    = '1.4';
 $module_author      = 'Ryan Djurovich, Rob Smith, Silvia Reins, Martin Hecht, Florian Meerwinck, Bianka Martinovic';
 $module_license     = 'GNU General Public License';
 $module_description = 'This page type is designed for making a news page with Images and Lightboxeffect.';
 
 /**
+ * v5.0.25 - 2024/01/31
+ *         - florian
+ *         ! fix issue with droplet fetchNewsItems (aka getnewsitems, which caused unwanted overwriting of droplet from NIA with the same name)
+ *
  * v5.0.24 - 2023/11/20
  *         - mrbaseman
  *         ! fix post_id in access file for next/prev pages
- *
+ 
  * v5.0.23 - 2023/11/20
  *         - florian
  *         ! fix sorting issue due to group assignment (undo changes from 5.0.13)

diff --git a/wbce/modules/news_img/install.php b/wbce/modules/news_img/install.php
@@ -225,17 +225,14 @@
             // workaround for problem with global $module_directory overwritten
             // by functions.inc.php here
             $orig_module_dir = $module_directory;
-            include __DIR__.'/droplets.functions.php';
-            $sDropletFile = __DIR__.'/droplets/getNewsItems.php';
-            if(is_readable($sDropletFile)){
-                if(importDropletFromFile($sDropletFile)){
-                    echo 'Droplet <b>getNewsItems</b> installed successfully.<br>';
-                }
-            }
+             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_fetchNewsItems.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');
+        CAT_Helper_Droplet::installDroplet(WB_PATH.'/modules/news_img/droplets/droplet_fetchNewsItems.zip');
     }
 
 };
diff --git a/wbce/modules/news_img/upgrade.php b/wbce/modules/news_img/upgrade.php
@@ -323,12 +323,12 @@ function scandir($directory, $sorting_order = 0)
             if (isset($module_directory)) { $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/');
+            wbce_unpack_and_import(WB_PATH.'/modules/news_img/droplets/droplet_fetchNewsItems.zip', WB_PATH . '/temp/unzip/');
             rm_full_dir(WB_PATH.'/temp/unzip');
             if (isset($orig_module_dir)) { $module_directory = $orig_module_dir; }
         } catch ( \Exception $e ) {}
     } else {
-        CAT_Helper_Droplet::installDroplet(WB_PATH.'/modules/news_img/droplets/droplet_getNewsItems.zip');
+        CAT_Helper_Droplet::installDroplet(WB_PATH.'/modules/news_img/droplets/droplet_fetchNewsItems.zip');
     }
 
 }