From 298f337f36fc4ed53ef8d8144a04aa339e2560a8 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Tue, 5 Oct 2021 16:45:18 +0200
Subject: [PATCH] Revert "FIX : travis feedback"

This reverts commit 1a651f089dbdbf8432476c68b0e36bdc07dcf9c1.
---
 htdocs/hrm/class/evaluation.class.php    | 2 +-
 htdocs/hrm/class/evaluationdet.class.php | 2 +-
 htdocs/hrm/class/job.class.php           | 2 +-
 htdocs/hrm/class/position.class.php      | 2 +-
 htdocs/hrm/class/skill.class.php         | 2 +-
 htdocs/hrm/class/skilldet.class.php      | 2 +-
 htdocs/hrm/class/skillrank.class.php     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index b13f031c136..7652b2bfd0f 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -422,7 +422,7 @@ class Evaluation extends CommonObject
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.$this->db->escape(implode(' '.$filtermode.' ', $sqlwhere)).')';
+			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index eb7ec1e253c..0608f14dbe9 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -395,7 +395,7 @@ class Evaluationline extends CommonObject
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.$this->db->escape(implode(' '.$filtermode.' ', $sqlwhere)).')';
+			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 2360c3536ef..23b08e00012 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -396,7 +396,7 @@ class Job extends CommonObject
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.$this->db->escape(implode(' '.$filtermode.' ', $sqlwhere)).')';
+			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 001a7151272..673840c83d4 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -407,7 +407,7 @@ class Position extends CommonObject
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.$this->db->escape(implode(' '.$filtermode.' ', $sqlwhere)).')';
+			$sql .= ' AND (' . implode(' ' . $filtermode . ' ', $sqlwhere) . ')';
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index 5d37f367309..b2fe7719564 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -442,7 +442,7 @@ class Skill extends CommonObject
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.$this->db->escape(implode(' '.$filtermode.' ', $sqlwhere)).')';
+			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index 03cd095ecc7..ca6752b2508 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -388,7 +388,7 @@ class Skilldet extends CommonObject
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.$this->db->escape(implode(' '.$filtermode.' ', $sqlwhere)).')';
+			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index e9126707550..c2a09936199 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -427,7 +427,7 @@ class SkillRank extends CommonObject
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.$this->db->escape(implode(' '.$filtermode.' ', $sqlwhere)).')';
+			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {