0
/
leftypol_lainchan
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix last commit; Make Tinyboard Twig extension more mb-safe

This commit is contained in:
Michael Foster 2013-07-31 16:38:09 -04:00
parent d692bce686
commit 6cdf603875
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inc/lib/Twig/Extensions/Extension/Tinyboard.php
View File

@ -83,9 +83,9 @@ function twig_hasPermission_filter($mod, $permission, $board = null) {
} }
function twig_extension_filter($value, $case_insensitive = true) { 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) if($case_insensitive)
$ext = strtolower($ext); $ext = mb_strtolower($ext);
return $ext; return $ext;
} }
@ -96,11 +96,11 @@ function twig_sprintf_filter( $value, $var) {
function twig_truncate_filter($value, $length = 30, $preserve = false, $separator = '…') { function twig_truncate_filter($value, $length = 30, $preserve = false, $separator = '…') {
if (mb_strlen($value) > $length) { if (mb_strlen($value) > $length) {
if ($preserve) { if ($preserve) {
if (false !== ($breakpoint = strpos($value, ' ', $length))) { if (false !== ($breakpoint = mb_strpos($value, ' ', $length))) {
$length = $breakpoint; $length = $breakpoint;
} }
} }
return substr($value, 0, $length) . $separator; return mb_substr($value, 0, $length) . $separator;
} }
return $value; return $value;
} }

4
templates/post_thread.html
View File

@ -23,9 +23,9 @@
{% if config.show_filename and post.filename %} {% if config.show_filename and post.filename %}
, ,
{% if post.filename|length > config.max_filename_display %} {% 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 %} {% else %}
<span class="postfilename">{{ post.filename|bidi_cleanup }}</span> <span class="postfilename">{{ post.filename|e|bidi_cleanup }}</span>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if post.thumb != 'file' and config.image_identification %} {% if post.thumb != 'file' and config.image_identification %}