Merge branch 'release/1.4.2'

Author: cedric-anne

inc/alert.class.php

@@ -246,13 +246,9 @@ public static function findAllToNotify($params = []) {
       //and not the current entity
       if ($p['show_helpdesk_alerts']) {
          $show_helpdesk_sql = " AND `$table`.`is_displayed_onhelpdesk`='1'";
-         $entity_sql = getEntitiesRestrictRequest(" AND", $table, "",
-                                                  $p['entities_id'], true);
-      } else if (!$p['show_only_login_alerts']) {
-         $entity_sql = getEntitiesRestrictRequest("AND", $table, "",
-                                                  $_SESSION['glpiactive_entity'],
-                                                  $_SESSION['glpiactive_entity_recursive'],
-                                                  true);
+      }
+      if (!$p['show_only_login_alerts']) {
+         $entity_sql = getEntitiesRestrictRequest("AND", $table, "", $p['entities_id'], true);
       }
 
       $query = "SELECT DISTINCT `$table`.`id`, `$table`.*

plugin.xml

@@ -53,6 +53,10 @@ Fonctionnalités
       <author>TECLIB'</author>
    </authors>
    <versions>
+      <version>
+         <num>1.4.2</num>
+         <compatibility>9.3</compatibility>
+      </version>
       <version>
          <num>1.4.1</num>
          <compatibility>9.3</compatibility>

setup.php

@@ -21,7 +21,7 @@
  --------------------------------------------------------------------------
 */
 
-define ('PLUGIN_NEWS_VERSION', '1.4.1');
+define ('PLUGIN_NEWS_VERSION', '1.4.2');
 
 // Minimal GLPI version, inclusive
 define("PLUGIN_NEWS_MIN_GLPI", "9.3");