diff options
| author | czaks <marcin@6irc.net> | 2014-04-19 00:24:52 +0200 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2014-04-19 00:24:52 +0200 |
| commit | bfc4df8276f1f3577e8d40f300ed0f3f02613cd0 (patch) | |
| tree | ff3a2e0d49a9c3d8058aa46df600d2b6eac674f2 /inc/functions.php | |
| parent | 5b9b0abc54d2aa7f632909ecdfeb11862dffb9ae (diff) | |
| parent | bd498227f5faebad7058efeae1f7badc469d7a0e (diff) | |
Merge branch 'master' of github.com:vichan-devel/Tinyboard into br-integration
Diffstat (limited to 'inc/functions.php')
| -rw-r--r-- | inc/functions.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/inc/functions.php b/inc/functions.php index 488a4117..b6927b4a 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -228,6 +228,12 @@ function loadConfig() { require_once 'inc/lib/recaptcha/recaptchalib.php'; if ($config['cache']['enabled']) require_once 'inc/cache.php'; + + if (in_array('webm', $config['allowed_ext_files'])) { + require_once 'inc/lib/webm/posthandler.php'; + event_handler('post', 'postHandler'); + } + event('load-config'); if ($config['debug']) { @@ -1267,7 +1273,9 @@ function make_comment_hex($str) { if (function_exists('iconv')) { // remove diacritics and other noise // FIXME: this removes cyrillic entirely - $str = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str); + $oldstr = $str; + $str = @iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str); + if (!$str) $str = $oldstr; } $str = strtolower($str); |