summaryrefslogtreecommitdiff
path: root/inc/config.php
diff options
context:
space:
mode:
authorMichael Save <savetheinternet@tinyboard.org>2012-03-17 10:32:50 +1100
committerMichael Save <savetheinternet@tinyboard.org>2012-03-17 10:32:50 +1100
commit4c3486bec95312553a699f7681916cbd4b0b8c50 (patch)
tree1f870c18302426bf7b24db5c7ce7d9ad21e9655f /inc/config.php
parentd531487bad5524f4a7c3d6e0c35b1293cb7924d2 (diff)
Thumbnailing alternative: `convert` (command line ImageMagick instead of PHP bindings)
Diffstat (limited to 'inc/config.php')
-rw-r--r--inc/config.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/inc/config.php b/inc/config.php
index 9398596c..1474bd46 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -102,7 +102,7 @@
// Use a persistent connection (experimental)
$config['db']['persistent'] = false;
// Anything more to add to the DSN string (eg. port=xxx;foo=bar)
- $config['db']['dsn'] = '';
+ $config['db']['dsn'] = 'charset=UTF-8';
// Timeout duration in seconds (not all drivers support this)
$config['db']['timeout'] = 5;
@@ -363,6 +363,9 @@
// Use Imagick instead of GD (some further config options below are ignored if set)
$config['imagick'] = false;
+ // Use the command line version of ImagickMagick rather than the PHP bindings.
+ $config['imagick_convert'] = false;
+
// Regular expression to check for IE MIME type detection XSS exploit. To disable, comment the line out
// https://github.com/savetheinternet/Tinyboard/issues/20
$config['ie_mime_type_detection'] = '/<(?:body|head|html|img|plaintext|pre|script|table|title|a href|channel|scriptlet)/i';