2 files changed, 3 insertions, 2 deletions

diff --git a/inc/contrib/Twig/Extensions/Extension/Tinyboard.php b/inc/contrib/Twig/Extensions/Extension/Tinyboard.php
index 49db4046..5748c0d3 100644
--- a/inc/contrib/Twig/Extensions/Extension/Tinyboard.php
+++ b/inc/contrib/Twig/Extensions/Extension/Tinyboard.php
@@ -72,7 +72,7 @@ function twig_sprintf_filter( $value, $var) {
 }
 
 function twig_truncate_filter($value, $length = 30, $preserve = false, $separator = '…') {
-	if (strlen($value) > $length) {
+	if (mb_strlen($value) > $length) {
 		if ($preserve) {
 			if (false !== ($breakpoint = strpos($value, ' ', $length))) {
 				$length = $breakpoint;
diff --git a/inc/functions.php b/inc/functions.php
index 3a5e0ecf..7dcdc088 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -7,7 +7,8 @@
 	
 	require 'contrib/gettext/gettext.inc';
 	
-	register_shutdown_function('fatal_error_handler'); 
+	register_shutdown_function('fatal_error_handler');
+	mb_internal_encoding('UTF-8');
 	loadConfig();
 	
 	function loadConfig() {