Merge branch '9.4/bugfixes' into 9.5/bugfixes

inc/commontreedropdown.class.php

@@ -535,6 +535,7 @@ abstract class CommonTreeDropdown extends CommonDropdown {
          $nb++;
          echo "<tr class='tab_bg_1'><td>";
          if ((($fk == 'entities_id') && in_array($data['id'], $_SESSION['glpiactiveentities']))
+             || !$entity_assign
              || (($fk != 'entities_id') && in_array($data['entities_id'], $_SESSION['glpiactiveentities']))) {
             echo "<a href='".$this->getFormURL();
             echo '?id='.$data['id']."'>".$data['name']."</a>";

inc/ipaddress.class.php

@@ -1162,8 +1162,10 @@ class IPAddress extends CommonDBChild {
                'ON' => [
                   'NAME'   => 'items_id',
                   'PORT'   => 'id', [
-                     'NOT' => [
-                        'PORT.itemtype' => $CFG_GLPI['networkport_types']
+                     'AND' => [
+                        'NOT' => [
+                           'PORT.itemtype' => $CFG_GLPI['networkport_types']
+                        ]
                      ]
                   ]
                ]
@@ -1193,13 +1195,13 @@ class IPAddress extends CommonDBChild {
          $queries[] = $criteria;
 
          $criteria = $main_criteria;
-         $criteria['SELECT'] = $criteria['SELECT'] + [
+         $criteria['SELECT'] = array_merge($criteria['SELECT'], [
             new \QueryExpression("NULL AS name_id"),
             new \QueryExpression("NULL AS port_id"),
             new \QueryExpression('NULL AS item_id'),
             new \QueryExpression("NULL AS item_type")
-         ];
-         $criteria['INNER JOIN']['glpi_ipaddresses AS ADDR']['ON'][0]['AND']['ADDR.itemtype'] = ['!', 'NetworkName'];
+         ]);
+         $criteria['INNER JOIN']['glpi_ipaddresses AS ADDR']['ON'][0]['AND']['ADDR.itemtype'] = ['!=', 'NetworkName'];
          $queries[] = $criteria;
 
          $union = new \QueryUnion($queries);

tests/units/DBmysqlIterator.php

@@ -946,8 +946,8 @@ class DBmysqlIterator extends DbTestCase {
                                                             AND `NAME`.`itemtype` = 'NetworkPort')
                      INNER JOIN `glpi_networkports` AS `PORT`
                         ON (`NAME`.`items_id` = `PORT`.`id`
-                              NOT `PORT`.`itemtype`
-                                 IN ('" .implode("', '", $CFG_GLPI["networkport_types"])."'))
+                             AND NOT (`PORT`.`itemtype`
+                                      IN ('" .implode("', '", $CFG_GLPI["networkport_types"])."')))
                      LEFT JOIN `glpi_entities` ON (`ADDR`.`entities_id` = `glpi_entities`.`id`)
                      WHERE `LINK`.`ipnetworks_id` = '42')";
 
@@ -1099,8 +1099,10 @@ class DBmysqlIterator extends DbTestCase {
             'ON' => [
                'NAME'   => 'items_id',
                'PORT'   => 'id', [
-                  'NOT' => [
-                     'PORT.itemtype' => $CFG_GLPI['networkport_types']
+                  'AND' => [
+                     'NOT' => [
+                        'PORT.itemtype' => $CFG_GLPI['networkport_types']
+                     ]
                   ]
                ]
             ]