summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-05-20 17:25:13 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-05-20 17:25:13 +0200
commit3b9f88df882ee1af6fbc8ca4f299b1b229307895 (patch)
tree1b2ca3e19855d024d952aab64c31652ae1c69e0e /application
parent63df37de043a3581a328e63207ea1c809c0e74c2 (diff)
modified the 'use_set_names' variable in the MySQL/i drivers to be a class property instead of static, in case multiple database servers are connected to in a single request. Also clarified description of the 'dbcollat' setting in the configuration files
Diffstat (limited to 'application')
-rw-r--r--application/config/database.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/application/config/database.php b/application/config/database.php
index e77bf97df..4bb7a5707 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -27,7 +27,8 @@
| ['char_set'] The character set used in communicating with the database
| ['dbcollat'] The character collation used in communicating with the database
| NOTE: For MySQL and MySQLi databases, this setting is only used
-| as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7.
+| as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7
+| (and in table creation queries made with DB Forge).
| There is an incompatibility in PHP with mysql_real_escape_string() which
| can make your site vulnerable to SQL injection if you are using a
| multi-byte character set and are running versions lower than these.