Added a test to prevent redefinition of the printValue function

Set version to 1.3.7 fixes #15
tomolimo · Aug 25, 2020 · 798f53a · 798f53a
1 parent eb90cb0
commit 798f53a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/impacts.xml b/impacts.xml
@@ -35,7 +35,7 @@
          <compatibility>9.3</compatibility>
       </version>
       <version>
-         <num>1.3.6</num>
+         <num>1.3.7</num>
          <compatibility>9.3</compatibility>
          <compatibility>9.4</compatibility>
       </version>

diff --git a/inc/config.class.php b/inc/config.class.php
@@ -133,9 +133,11 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtem
    static function getAssetList($completelist = false) {
       global $CFG_GLPI;
 
-      function printValue($value, $key, $userData) {
-         if (strcmp($value, '*')) {
-            $userData[] = $value;
+      if (!function_exists('printValue')) {
+         function printValue($value, $key, $userData) {
+            if (strcmp($value, '*')) {
+               $userData[] = $value;
+            }
          }
       }
 

diff --git a/setup.php b/setup.php
@@ -32,7 +32,7 @@
 // ----------------------------------------------------------------------
 
 
-define('IMPACTS_VERSION', '1.3.6');
+define('IMPACTS_VERSION', '1.3.7');
 
 // Minimal GLPI version, inclusive
 define("IMPACTS_MIN_GLPI", "9.3");