tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-29 16:09:23 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10377 from creative-commoners/pulls/4.11/mysql-null

Browse Source 
FIX Ensure not passing null to mysql methods for PHP 8.1 compatibility
This commit is contained in:
Guy Sartorelli 2022-06-29 10:01:12 +12:00 committed by GitHub
commit 01c27e69de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ORM/Connect/MySQLiConnector.php
View File

@ -151,7 +151,7 @@ class MySQLiConnector extends DBConnector
public function escapeString($value) public function escapeString($value)
{ {
return $this->dbConn->real_escape_string($value); return $this->dbConn->real_escape_string($value ?? '');
} }
public function quoteString($value) public function quoteString($value)
@ -181,7 +181,7 @@ class MySQLiConnector extends DBConnector
$this->beforeQuery($sql); $this->beforeQuery($sql);
// Benchmark query // Benchmark query
$handle = $this->dbConn->query($sql, MYSQLI_STORE_RESULT); $handle = $this->dbConn->query($sql ?? '', MYSQLI_STORE_RESULT);
if (!$handle || $this->dbConn->error) { if (!$handle || $this->dbConn->error) {
$this->databaseError($this->getLastError(), $errorLevel, $sql); $this->databaseError($this->getLastError(), $errorLevel, $sql);
@ -319,7 +319,7 @@ class MySQLiConnector extends DBConnector
public function selectDatabase($name) public function selectDatabase($name)
{ {
if ($this->dbConn->select_db($name)) { if ($this->dbConn->select_db($name ?? '')) {
$this->databaseName = $name; $this->databaseName = $name;
return true; return true;
} }