diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-04 13:37:01 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-04 13:37:01 +0000 |
| commit | 7a11fdbb644dc467ede71ca09d205d5ec2ef7ae1 (patch) | |
| tree | cb16dbda4780ead8f901f08224453b908b7a8570 /phpBB/includes | |
| parent | 2fcd96ca72741bdfb36c24a0af9dd8230b5a828f (diff) | |
| download | forums-7a11fdbb644dc467ede71ca09d205d5ec2ef7ae1.tar forums-7a11fdbb644dc467ede71ca09d205d5ec2ef7ae1.tar.gz forums-7a11fdbb644dc467ede71ca09d205d5ec2ef7ae1.tar.bz2 forums-7a11fdbb644dc467ede71ca09d205d5ec2ef7ae1.tar.xz forums-7a11fdbb644dc467ede71ca09d205d5ec2ef7ae1.zip | |
direct calls
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8815 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/db/mysql.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php index 31b2850776..080f3d541a 100644 --- a/phpBB/includes/db/mysql.php +++ b/phpBB/includes/db/mysql.php @@ -51,14 +51,12 @@ class dbal_mysql extends dbal if (@mysql_select_db($this->dbname, $this->db_connect_id)) { // Determine what version we are using and if it natively supports UNICODE - $this->sql_server_info(); - - if (version_compare($this->sql_server_version, '4.1.3', '>=')) + if (version_compare($this->sql_server_info(true), '4.1.3', '>=')) { @mysql_query("SET NAMES 'utf8'", $this->db_connect_id); // enforce strict mode on databases that support it - if (version_compare($this->sql_server_version, '5.0.2', '>=')) + if (version_compare($this->sql_server_info(true), '5.0.2', '>=')) { $result = @mysql_query('SELECT @@session.sql_mode AS sql_mode', $this->db_connect_id); $row = @mysql_fetch_assoc($result); @@ -83,7 +81,7 @@ class dbal_mysql extends dbal @mysql_query("SET SESSION sql_mode='{$mode}'", $this->db_connect_id); } } - else if (version_compare($this->sql_server_version, '4.0.0', '<')) + else if (version_compare($this->sql_server_info(true), '4.0.0', '<')) { $this->sql_layer = 'mysql'; } |