Skip to content

Commit

Permalink
Fix comments search result to work with multibyte strings
Browse files Browse the repository at this point in the history
Currently, the searching in comments breaks up, if comments contain multibyte characters and string manipulation logic in getRelevantMessagePart happens to cut through them rendering the resulting string invalid (not UTF-8 compliant). This patch replaces all string manipulating functions in this code to multibyte aware ones.
  • Loading branch information
mwegrzynek authored Dec 9, 2019
1 parent bb8ac6c commit e5df93f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions apps/comments/lib/Search/Result.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ protected function getVisiblePath(string $path): string {
* @throws NotFoundException
*/
protected function getRelevantMessagePart(string $message, string $search): string {
$start = stripos($message, $search);
$start = mb_stripos($message, $search);
if ($start === false) {
throw new NotFoundException('Comment section not found');
}

$end = $start + strlen($search);
$end = $start + mb_strlen($search);

if ($start <= 25) {
$start = 0;
Expand All @@ -97,15 +97,15 @@ protected function getRelevantMessagePart(string $message, string $search): stri
$prefix = '';
}

if ((strlen($message) - $end) <= 25) {
$end = strlen($message);
if ((mb_strlen($message) - $end) <= 25) {
$end = mb_strlen($message);
$suffix = '';
} else {
$end += 25;
$suffix = '';
}

return $prefix . substr($message, $start, $end - $start) . $suffix;
return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
}

}

0 comments on commit e5df93f

Please sign in to comment.