mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix comments search result to work with multibyte strings 

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.

Signed-off-by: Michał Węgrzynek <michal.wegrzynek@malloc.com.pl>
This commit is contained in:
Michał Węgrzynek 2019-12-09 17:22:49 +01:00 committed by Backportbot
parent c4c8b7677d
commit 2f8cfbb76d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/comments/lib/Search/Result.php
View File

@ -80,12 +80,12 @@ class Result extends BaseResult {
* @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;
@ -95,15 +95,15 @@ class Result extends BaseResult {
$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;
}
}