Browse Source

utf8_substr() replaced to mb_substr()

Visman 8 years ago
parent
commit
dabff91232
4 changed files with 6 additions and 6 deletions
  1. 1 1
      extern.php
  2. 1 1
      include/parser.php
  3. 1 1
      include/subforums_view.php
  4. 3 3
      upfiles.php

+ 1 - 1
extern.php

@@ -268,7 +268,7 @@ function output_html($feed)
 	foreach ($feed['items'] as $item)
 	{
 		if (mb_strlen($item['title']) > FORUM_EXTERN_MAX_SUBJECT_LENGTH)
-			$subject_truncated = pun_htmlspecialchars(trim(utf8_substr($item['title'], 0, (FORUM_EXTERN_MAX_SUBJECT_LENGTH - 5)))).' …';
+			$subject_truncated = pun_htmlspecialchars(trim(mb_substr($item['title'], 0, (FORUM_EXTERN_MAX_SUBJECT_LENGTH - 5)))).' …';
 		else
 			$subject_truncated = pun_htmlspecialchars($item['title']);
 

+ 1 - 1
include/parser.php

@@ -697,7 +697,7 @@ function handle_url_tag($url, $link = '', $bbcode = false)
 		if ($link == '' || $link == $url)
 		{
 			$url = pun_htmlspecialchars_decode($url);
-			$link = mb_strlen($url) > 55 ? utf8_substr($url, 0 , 39).' … '.utf8_substr($url, -10) : $url;
+			$link = mb_strlen($url) > 55 ? mb_substr($url, 0 , 39).' … '.mb_substr($url, -10) : $url;
 			$link = pun_htmlspecialchars($link);
 		}
 		else

+ 1 - 1
include/subforums_view.php

@@ -181,7 +181,7 @@ foreach ($sf_array[$sf_cur_forum] as $cur_subforum)
 
 	// If there is a last_post/last_poster
 	if ($cur_subforum['last_post'] != '')
-		$last_post = '<a href="viewtopic.php?pid='.$cur_subforum['last_post_id'].'#p'.$cur_subforum['last_post_id'].'">'.pun_htmlspecialchars(mb_strlen($cur_subforum['last_topic']) > 30 ? utf8_substr($cur_subforum['last_topic'], 0, 30).'…' : $cur_subforum['last_topic']).'</a> <span class="byuser">'.format_time($cur_subforum['last_post']).' '.$lang_common['by'].' '.pun_htmlspecialchars($cur_subforum['last_poster']).'</span>'; // last topic on index - Visman
+		$last_post = '<a href="viewtopic.php?pid='.$cur_subforum['last_post_id'].'#p'.$cur_subforum['last_post_id'].'">'.pun_htmlspecialchars(mb_strlen($cur_subforum['last_topic']) > 30 ? mb_substr($cur_subforum['last_topic'], 0, 30).'…' : $cur_subforum['last_topic']).'</a> <span class="byuser">'.format_time($cur_subforum['last_post']).' '.$lang_common['by'].' '.pun_htmlspecialchars($cur_subforum['last_poster']).'</span>'; // last topic on index - Visman
 	else if ($cur_subforum['redirect_url'] != '')
 		$last_post = '- - -';
 	else

+ 3 - 3
upfiles.php

@@ -394,11 +394,11 @@ else
 
 ?>
 						<li>
-							<div class="upf-name" title="<?php echo pun_htmlspecialchars($f) ?>"><span><?php echo pun_htmlspecialchars(mb_strlen($f) > 20 ? utf8_substr($f, 0, 18).'…' : $f) ?></span></div>
+							<div class="upf-name" title="<?php echo pun_htmlspecialchars($f) ?>"><span><?php echo pun_htmlspecialchars(mb_strlen($f) > 20 ? mb_substr($f, 0, 18).'…' : $f) ?></span></div>
 							<div class="upf-file" style="height:<?php echo $height ?>px;">
 								<a href="<?php echo pun_htmlspecialchars(get_base_url(true).'/'.$file).$fb ?>">
-<?php if ($fmini || $fb): ?>									<img src="<?php echo pun_htmlspecialchars($fmini ? get_base_url(true).'/'.$mini : get_base_url(true).'/'.$file) ?>" alt="<?php echo pun_htmlspecialchars((mb_strlen($fi[1]) > 15 ? utf8_substr($fi[1], 0, 10).'… ' : $fi[1]).'.'.$fi[2]) ?>" />
-<?php else: ?>									<span><?php echo pun_htmlspecialchars((mb_strlen($fi[1]) > 15 ? utf8_substr($fi[1], 0, 10).'… ' : $fi[1]).'.'.$fi[2]) ?></span>
+<?php if ($fmini || $fb): ?>									<img src="<?php echo pun_htmlspecialchars($fmini ? get_base_url(true).'/'.$mini : get_base_url(true).'/'.$file) ?>" alt="<?php echo pun_htmlspecialchars((mb_strlen($fi[1]) > 15 ? mb_substr($fi[1], 0, 10).'… ' : $fi[1]).'.'.$fi[2]) ?>" />
+<?php else: ?>									<span><?php echo pun_htmlspecialchars((mb_strlen($fi[1]) > 15 ? mb_substr($fi[1], 0, 10).'… ' : $fi[1]).'.'.$fi[2]) ?></span>
 <?php endif; ?>
 								</a>
 							</div>