diff options
author | Marc Alexander <admin@m-a-styles.de> | 2019-09-20 22:21:47 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2019-09-20 22:21:47 +0200 |
commit | f0afccb173fb728b6c70a8bd86c4d8869043581a (patch) | |
tree | a6621ca13c644cacb8e36d449f338ecdcf78756c /phpBB/phpbb/db/driver/mysqli.php | |
parent | 4db585a4cb2e5359074a82ef088574609155294b (diff) | |
parent | b94464d06382a4b379d9dcd52f1bee757a4a0500 (diff) | |
download | forums-f0afccb173fb728b6c70a8bd86c4d8869043581a.tar forums-f0afccb173fb728b6c70a8bd86c4d8869043581a.tar.gz forums-f0afccb173fb728b6c70a8bd86c4d8869043581a.tar.bz2 forums-f0afccb173fb728b6c70a8bd86c4d8869043581a.tar.xz forums-f0afccb173fb728b6c70a8bd86c4d8869043581a.zip |
Merge branch 'prep-release-3.2.8' into 3.2.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 d43e201526..b429ad97aa 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 |