Skip to content

[3.10] [PHP 8.1] Mysqli database driver escape function fix #36787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 23, 2022
Merged

[3.10] [PHP 8.1] Mysqli database driver escape function fix #36787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a807845
[3.10] [PHP 8.1] Mysqli database driver escapt function fix
beat Jan 22, 2022
cf03218
Fix also the other db drivers
richard67 Jan 22, 2022
2bfda40
Merge pull request #5 from richard67/3.10-dev-beat-patch-16-mod-1
beat Jan 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libraries/joomla/database/driver/mysql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
4 changes: 2 additions & 2 deletions libraries/joomla/database/driver/mysqli.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
4 changes: 2 additions & 2 deletions libraries/joomla/database/driver/pdo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/joomla/database/driver/pdomysql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions libraries/joomla/database/driver/postgresql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down