summaryrefslogtreecommitdiffstats
path: root/application/config/example
diff options
context:
space:
mode:
Diffstat (limited to 'application/config/example')
-rwxr-xr-xapplication/config/example/database.php3
-rwxr-xr-xapplication/config/example/mimes.php6
2 files changed, 5 insertions, 4 deletions
diff --git a/application/config/example/database.php b/application/config/example/database.php
index ee6b76a06..51b666b38 100755
--- a/application/config/example/database.php
+++ b/application/config/example/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.
diff --git a/application/config/example/mimes.php b/application/config/example/mimes.php
index 82767d7c8..f00e5b6ed 100755
--- a/application/config/example/mimes.php
+++ b/application/config/example/mimes.php
@@ -65,8 +65,8 @@ $mimes = array( 'hqx' => 'application/mac-binhex40',
'rpm' => 'audio/x-pn-realaudio-plugin',
'ra' => 'audio/x-realaudio',
'rv' => 'video/vnd.rn-realvideo',
- 'wav' => 'audio/x-wav',
- 'bmp' => 'image/bmp',
+ 'wav' => array('audio/x-wav', 'audio/wave', 'audio/wav'),
+ 'bmp' => array('image/bmp', 'image/x-windows-bmp'),
'gif' => 'image/gif',
'jpeg' => array('image/jpeg', 'image/pjpeg'),
'jpg' => array('image/jpeg', 'image/pjpeg'),
@@ -103,4 +103,4 @@ $mimes = array( 'hqx' => 'application/mac-binhex40',
/* End of file mimes.php */
-/* Location: ./application/config/mimes.php */ \ No newline at end of file
+/* Location: ./application/config/mimes.php */