diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-09-20 22:23:06 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-09-20 22:23:06 +0200 |
| commit | a7c02304a56e29c0fd4833626ec692a6babcb269 (patch) | |
| tree | 8faf99cb5e786106c1c8ccfa5d2091e2759d2fb0 /phpBB/phpbb/db/driver/mysqli.php | |
| parent | d6139846607a4fe3a13d5863b3fa6a52b1fe3c10 (diff) | |
| parent | f0afccb173fb728b6c70a8bd86c4d8869043581a (diff) | |
| download | forums-a7c02304a56e29c0fd4833626ec692a6babcb269.tar forums-a7c02304a56e29c0fd4833626ec692a6babcb269.tar.gz forums-a7c02304a56e29c0fd4833626ec692a6babcb269.tar.bz2 forums-a7c02304a56e29c0fd4833626ec692a6babcb269.tar.xz forums-a7c02304a56e29c0fd4833626ec692a6babcb269.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/phpbb/db/driver/mysqli.php')
| -rw-r--r-- | phpBB/phpbb/db/driver/mysqli.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php index df8b88c315..0c1c063262 100644 --- a/phpBB/phpbb/db/driver/mysqli.php +++ b/phpBB/phpbb/db/driver/mysqli.php @@ -68,6 +68,9 @@ class mysqli extends \phpbb\db\driver\mysql_base if ($this->db_connect_id && $this->dbname != '') { + // Disable loading local files on client side + @mysqli_options($this->db_connect_id, MYSQLI_OPT_LOCAL_INFILE, false); + @mysqli_query($this->db_connect_id, "SET NAMES 'utf8'"); // enforce strict mode on databases that support it |