From 6cdf6038754f18af4509ecf078f51894f63c5853 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Wed, 31 Jul 2013 16:38:09 -0400
Subject: [PATCH] Fix last commit; Make Tinyboard Twig extension more mb-safe

---
 inc/lib/Twig/Extensions/Extension/Tinyboard.php | 8 ++++----
 templates/post_thread.html                      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/inc/lib/Twig/Extensions/Extension/Tinyboard.php b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
index 61cf9fc9..58a98c40 100644
--- a/inc/lib/Twig/Extensions/Extension/Tinyboard.php
+++ b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
@@ -83,9 +83,9 @@ function twig_hasPermission_filter($mod, $permission, $board = null) {
 }
 
 function twig_extension_filter($value, $case_insensitive = true) {
-	$ext = substr($value, strrpos($value, '.') + 1);
+	$ext = mb_substr($value, mb_strrpos($value, '.') + 1);
 	if($case_insensitive)
-		$ext = strtolower($ext);		
+		$ext = mb_strtolower($ext);		
 	return $ext;
 }
 
@@ -96,11 +96,11 @@ function twig_sprintf_filter( $value, $var) {
 function twig_truncate_filter($value, $length = 30, $preserve = false, $separator = '&hellip;') {
 	if (mb_strlen($value) > $length) {
 		if ($preserve) {
-			if (false !== ($breakpoint = strpos($value, ' ', $length))) {
+			if (false !== ($breakpoint = mb_strpos($value, ' ', $length))) {
 				$length = $breakpoint;
 			}
 		}
-		return substr($value, 0, $length) . $separator;
+		return mb_substr($value, 0, $length) . $separator;
 	}
 	return $value;
 }
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 6d14f207..21add308 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -23,9 +23,9 @@
 		{% if config.show_filename and post.filename %}
 			, 
 			{% if post.filename|length > config.max_filename_display %}
-				<span class="postfilename" title="{{ post.filename|bidi_cleanup }}">{{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }}</span>
+				<span class="postfilename" title="{{ post.filename|e|bidi_cleanup }}">{{ post.filename|truncate(config.max_filename_display)|bidi_cleanup }}</span>
 			{% else %}
-				<span class="postfilename">{{ post.filename|bidi_cleanup }}</span>
+				<span class="postfilename">{{ post.filename|e|bidi_cleanup }}</span>
 			{% endif %}
 		{% endif %}
 		{% if post.thumb != 'file' and config.image_identification %}