From 24fcb2ff164a341dfa1b9dbbc7cdff1065346874 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Dec 2022 13:06:22 +0100
Subject: [PATCH] The deprecated method escapeunderscore() of database handlers
 has been removed. You must use escapeforlike instead.

---
 htdocs/blockedlog/class/blockedlog.class.php |  2 +-
 htdocs/core/db/Database.interface.php        | 13 ++-----------
 htdocs/core/db/mysqli.class.php              | 12 ------------
 htdocs/core/db/pgsql.class.php               | 12 ------------
 htdocs/core/db/sqlite3.class.php             | 12 ------------
 htdocs/core/lib/functions.lib.php            |  1 -
 htdocs/debugbar/class/TraceableDB.php        | 12 ------------
 7 files changed, 3 insertions(+), 61 deletions(-)

diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 70ba9a2b531..2e21de46895 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -796,7 +796,7 @@ class BlockedLog
 	{
 		try {
 			//include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-			$aaa = unserialize($data);
+			$aaa = jsonOrUnserialize($data);
 		} catch (Exception $e) {
 			//print $e->getErrs);
 		}
diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php
index eda21d3cd95..180f928eac0 100644
--- a/htdocs/core/db/Database.interface.php
+++ b/htdocs/core/db/Database.interface.php
@@ -173,20 +173,11 @@ interface Database
 	/**
 	 * Escape a string to insert data
 	 *
-	 * @param   string $stringtoencode String to escape
-	 * @return  string                        String escaped
+	 * @param   string $stringtoencode 		String to escape
+	 * @return  string                      String escaped
 	 */
 	public function escape($stringtoencode);
 
-	/**
-	 * Escape a string to insert data
-	 *
-	 * @param   string $stringtoencode String to escape
-	 * @return  string                        String escaped
-	 * @deprecated
-	 */
-	public function escapeunderscore($stringtoencode);
-
 	/**
 	 *	Escape a string to insert data into a like
 	 *
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 9393f10489f..7d184dc06cf 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -474,18 +474,6 @@ class DoliDBMysqli extends DoliDB
 		return $this->db->real_escape_string((string) $stringtoencode);
 	}
 
-	/**
-	 *	Escape a string to insert data
-	 *
-	 *	@param	string	$stringtoencode		String to escape
-	 *	@return	string						String escaped
-	 *  @deprecated
-	 */
-	public function escapeunderscore($stringtoencode)
-	{
-		return str_replace('_', '\_', (string) $stringtoencode);
-	}
-
 	/**
 	 *	Escape a string to insert data into a like
 	 *
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 28ac15a43ff..069afeca4ff 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -721,18 +721,6 @@ class DoliDBPgsql extends DoliDB
 		return pg_escape_string($stringtoencode);
 	}
 
-	/**
-	 *	Escape a string to insert data
-	 *
-	 *	@param	string	$stringtoencode		String to escape
-	 *	@return	string						String escaped
-	 *  @deprecated
-	 */
-	public function escapeunderscore($stringtoencode)
-	{
-		return str_replace('_', '\_', (string) $stringtoencode);
-	}
-
 	/**
 	 *	Escape a string to insert data into a like
 	 *
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index e31eeffe457..8c10c26d464 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -649,18 +649,6 @@ class DoliDBSqlite3 extends DoliDB
 		return Sqlite3::escapeString($stringtoencode);
 	}
 
-	/**
-	 *	Escape a string to insert data
-	 *
-	 *	@param	string	$stringtoencode		String to escape
-	 *	@return	string						String escaped
-	 *  @deprecated
-	 */
-	public function escapeunderscore($stringtoencode)
-	{
-		return str_replace('_', '\_', (string) $stringtoencode);
-	}
-
 	/**
 	 *	Escape a string to insert data into a like
 	 *
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d71c61909c1..1a3dd2bb12e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -11428,7 +11428,6 @@ function jsonOrUnserialize($stringtodecode)
 }
 
 
-
 /**
  * Return if a $sqlfilters parameter is valid and will pass the preg_replace_callback() to replace Generic filter string with SQL filter string
  * Example of usage:
diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index 0b862f4df70..a5f76f71aa7 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -251,18 +251,6 @@ class TraceableDB extends DoliDB
 		return $this->db->escape($stringtoencode);
 	}
 
-	/**
-	 * Escape a string to insert data
-	 *
-	 * @param   string $stringtoencode String to escape
-	 * @return  string                        String escaped
-	 * @deprecated
-	 */
-	public function escapeunderscore($stringtoencode)
-	{
-		return $this->db->escapeunderscore($stringtoencode);
-	}
-
 	/**
 	 *	Escape a string to insert data into a like
 	 *