[3.10] [PHP 8.1] Mysqli database driver escape function fix (joomla#3…

…6787) * [3.10] [PHP 8.1] Mysqli database driver escapt function fix Fixes `Deprecated: mysqli_real_escape_string(): Passing null to parameter #2 ($string) of type string is deprecated in libraries/joomla/database/driver/mysqli.php on line 254` * Fix also the other db drivers Co-authored-by: Richard Fath <[email protected]>
roland-d · Jan 23, 2022 · a03c3f1 · a03c3f1
1 parent 3de1ce1
commit a03c3f1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/libraries/joomla/database/driver/mysql.php b/libraries/joomla/database/driver/mysql.php
@@ -154,12 +154,12 @@ public function escape($text, $extra = false)
 		if (is_float($text))
 		{
 			// Force the dot as a decimal point.
-			return str_replace(',', '.', $text);
+			return str_replace(',', '.', (string) $text);
 		}
 
 		$this->connect();
 
-		$result = mysql_real_escape_string($text, $this->getConnection());
+		$result = mysql_real_escape_string((string) $text, $this->getConnection());
 
 		if ($extra)
 		{

diff --git a/libraries/joomla/database/driver/mysqli.php b/libraries/joomla/database/driver/mysqli.php
@@ -246,12 +246,12 @@ public function escape($text, $extra = false)
 		if (is_float($text))
 		{
 			// Force the dot as a decimal point.
-			return str_replace(',', '.', $text);
+			return str_replace(',', '.', (string) $text);
 		}
 
 		$this->connect();
 
-		$result = mysqli_real_escape_string($this->getConnection(), $text);
+		$result = mysqli_real_escape_string($this->getConnection(), (string) $text);
 
 		if ($extra)
 		{

diff --git a/libraries/joomla/database/driver/pdo.php b/libraries/joomla/database/driver/pdo.php
@@ -349,10 +349,10 @@ public function escape($text, $extra = false)
 		if (is_float($text))
 		{
 			// Force the dot as a decimal point.
-			return str_replace(',', '.', $text);
+			return str_replace(',', '.', (string) $text);
 		}
 
-		$text = str_replace("'", "''", $text);
+		$text = str_replace("'", "''", (string) $text);
 
 		return addcslashes($text, "\000\n\r\\\032");
 	}

diff --git a/libraries/joomla/database/driver/pdomysql.php b/libraries/joomla/database/driver/pdomysql.php
@@ -464,7 +464,7 @@ public function escape($text, $extra = false)
 		if (is_float($text))
 		{
 			// Force the dot as a decimal point.
-			return str_replace(',', '.', $text);
+			return str_replace(',', '.', (string) $text);
 		}
 
 		$this->connect();

diff --git a/libraries/joomla/database/driver/postgresql.php b/libraries/joomla/database/driver/postgresql.php
@@ -212,12 +212,12 @@ public function escape($text, $extra = false)
 		if (is_float($text))
 		{
 			// Force the dot as a decimal point.
-			return str_replace(',', '.', $text);
+			return str_replace(',', '.', (string) $text);
 		}
 
 		$this->connect();
 
-		$result = pg_escape_string($this->connection, $text);
+		$result = pg_escape_string($this->connection, (string) $text);
 
 		if ($extra)
 		{