summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-04-20 02:47:34 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-04-20 02:47:34 +0200
commitbab1a6aab7aa9bd2ba0ad7bc51973dd00d273b31 (patch)
treea2360c3d03813783d0fca44b1fe2947e9873fb26 /application
parentf5c840241084e03d49e521bfcb62d2adbe9fce7d (diff)
parent6ae70cc8499499b5d77d77ec8974f95873edb861 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter-Reactor
Diffstat (limited to 'application')
-rw-r--r--application/config/database.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/application/config/database.php b/application/config/database.php
index 24d611ac5..fa541a734 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -26,6 +26,12 @@
| ['cachedir'] The path to the folder where cache files should be stored
| ['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.
+| 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.
+| Sites using Latin-1 or UTF-8 database character set and collation are unaffected.
| ['swap_pre'] A default table prefix that should be swapped with the dbprefix
| ['autoinit'] Whether or not to automatically initialize the database.
| ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections