Merge branch 'release/1.7.3'

pluginsGLPI · Apr 27, 2021 · 2057a84 · 2057a84
2 parents 3be79ca + 4fd2a74
commit 2057a84
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 32 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/inc/common.class.php b/inc/common.class.php
@@ -1298,7 +1298,8 @@ static function selectorForMultipleGroups($field, $condition = [], $label = '')
       }
 
       $datas = [];
-      foreach (getAllDataFromTable('glpi_groups', $condition, false, 'name') as $data) {
+      $condition['ORDER'] = 'name';
+      foreach (getAllDataFromTable('glpi_groups', $condition, false) as $data) {
          $datas[$data['id']] = $data['completename'];
       }
 

diff --git a/mreporting.xml b/mreporting.xml
@@ -98,6 +98,11 @@ Voir documentation : https://github.com/PluginsGLPI/mreporting/wiki
       <author>Infotel</author>
    </authors>
    <versions>
+      <version>
+         <num>1.7.3</num>
+         <compatibility>~9.5.0</compatibility>
+         <download_url>https://github.com/pluginsGLPI/mreporting/releases/download/1.7.3/glpi-mreporting-1.7.3.tar.bz2</download_url>
+      </version>
       <version>
          <num>1.7.2</num>
          <compatibility>~9.5.0</compatibility>

diff --git a/setup.php b/setup.php
@@ -26,7 +26,7 @@
  --------------------------------------------------------------------------
  */
 
-define ('PLUGIN_MREPORTING_VERSION', '1.7.2');
+define ('PLUGIN_MREPORTING_VERSION', '1.7.3');
 
 // Minimal GLPI version, inclusive
 define("PLUGIN_MREPORTING_MIN_GLPI", "9.5");