diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-11-23 00:54:40 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-11-23 00:54:56 +0100 |
| commit | 943ab555da799fd94b221d5cd0a82fce568de042 (patch) | |
| tree | 613e88d68c78b7680a8e5b3654c52552c7a2598a /phpBB/phpbb/db/driver/mysqli.php | |
| parent | e108418824857e670a92f516285455f79bf6e12a (diff) | |
| parent | 0d0b2627f723c3003af0ea301511a972008e7734 (diff) | |
| download | forums-943ab555da799fd94b221d5cd0a82fce568de042.tar forums-943ab555da799fd94b221d5cd0a82fce568de042.tar.gz forums-943ab555da799fd94b221d5cd0a82fce568de042.tar.bz2 forums-943ab555da799fd94b221d5cd0a82fce568de042.tar.xz forums-943ab555da799fd94b221d5cd0a82fce568de042.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912
Conflicts:
phpBB/config/services.yml
Diffstat (limited to 'phpBB/phpbb/db/driver/mysqli.php')
| -rw-r--r-- | phpBB/phpbb/db/driver/mysqli.php | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php index 4d0e43b464..adc8f96302 100644 --- a/phpBB/phpbb/db/driver/mysqli.php +++ b/phpBB/phpbb/db/driver/mysqli.php @@ -10,14 +10,6 @@ namespace phpbb\db\driver; /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -/** * MySQLi Database Abstraction Layer * mysqli-extension has to be compiled with: * MySQL 4.1+ or MySQL 5.0+ @@ -31,7 +23,7 @@ class mysqli extends \phpbb\db\driver\mysql_base /** * Connect to server */ - function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false , $new_link = false) + function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false) { if (!function_exists('mysqli_connect')) { @@ -47,11 +39,11 @@ class mysqli extends \phpbb\db\driver\mysql_base $this->server = ($this->persistency) ? 'p:' . (($sqlserver) ? $sqlserver : 'localhost') : $sqlserver; $this->dbname = $database; - $port = (!$port) ? NULL : $port; + $port = (!$port) ? null : $port; // If port is set and it is not numeric, most likely mysqli socket is set. // Try to map it to the $socket parameter. - $socket = NULL; + $socket = null; if ($port) { if (is_numeric($port)) @@ -61,7 +53,7 @@ class mysqli extends \phpbb\db\driver\mysql_base else { $socket = $port; - $port = NULL; + $port = null; } } |