No JOIN if no profile check

pluginsGLPI · Oct 27, 2022 · dce3d6c · dce3d6c
1 parent 8d27dfb
commit dce3d6c
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/inc/container.class.php b/inc/container.class.php
@@ -1597,14 +1597,14 @@ public static function getAddSearchOptions($itemtype, $containers_id = false)
         $query = "SELECT DISTINCT fields.id, fields.name, fields.label, fields.type, fields.is_readonly, fields.allowed_values,
             containers.name as container_name, containers.label as container_label,
             containers.itemtypes, containers.id as container_id, fields.id as field_id
-         FROM glpi_plugin_fields_containers containers
-         INNER JOIN glpi_plugin_fields_profiles profiles
+         FROM glpi_plugin_fields_containers containers";
+        if (!Session::isCron()) {
+            $query .= " INNER JOIN glpi_plugin_fields_profiles profiles
             ON containers.id = profiles.plugin_fields_containers_id
-            AND profiles.right > 0";
-            if (!Session::isCron()) {
-                $query .= " AND profiles.profiles_id = " . (int)$_SESSION['glpiactiveprofile']['id'];
-            }
-            $query .= " INNER JOIN glpi_plugin_fields_fields fields
+            AND profiles.right > 0
+            AND profiles.profiles_id = " . (int)$_SESSION['glpiactiveprofile']['id'];
+        }
+        $query .= " INNER JOIN glpi_plugin_fields_fields fields
             ON containers.id = fields.plugin_fields_containers_id
             AND containers.is_active = 1
          WHERE containers.itemtypes LIKE '%" . $DB->escape($search_string) . "%'