Avoid using same var for method parameter and query construction, fix #…

…4636
glpi-project · Sep 14, 2018 · 7837de9 · 7837de9
1 parent bad3335
commit 7837de9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/inc/rule.class.php b/inc/rule.class.php
@@ -2698,7 +2698,7 @@ function getRulesForCriteria($crit) {
       /// TODO : not working for SLALevels : no sub_type
 
       //Get all the rules whose sub_type is $sub_type and entity is $ID
-      $crit = [
+      $query = [
          'SELECT' => $this->getTable() . '.id',
          'FROM'   => [
             getTableForItemType($this->ruleactionclass),
@@ -2712,10 +2712,10 @@ function getRulesForCriteria($crit) {
       ];
 
       foreach ($crit as $field => $value) {
-         $crit['WHERE'][getTableForItemType($this->ruleactionclass).'.'.$field] = $value;
+         $query['WHERE'][getTableForItemType($this->ruleactionclass).'.'.$field] = $value;
       }
 
-      $iterator = $DB->request($crit);
+      $iterator = $DB->request($query);
 
       while ($rule = $iterator->next()) {
          $affect_rule = new Rule();

diff --git a/inc/ruleimportentity.class.php b/inc/ruleimportentity.class.php
@@ -141,7 +141,7 @@ function displayAdditionalRuleCondition($condition, $criteria, $name, $value, $t
    function getAdditionalCriteriaDisplayPattern($ID, $condition, $pattern) {
 
       $crit = $this->getCriteria($ID);
-      if ($crit['field'] == '_source') {
+      if (count($crit) && $crit['field'] == '_source') {
          $name = Plugin::getInfo($pattern, 'name');
          if (empty($name)) {
             return false;