From e5df93f480ef8af42ad6e22fe667adb615366c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20W=C4=99grzynek?=
 <michal.wegrzynek@malloc.com.pl>
Date: Mon, 9 Dec 2019 17:22:49 +0100
Subject: [PATCH] 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.
---
 apps/comments/lib/Search/Result.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/comments/lib/Search/Result.php b/apps/comments/lib/Search/Result.php
index 039b1c56e4a9d..4fc9e7bc75b99 100644
--- a/apps/comments/lib/Search/Result.php
+++ b/apps/comments/lib/Search/Result.php
@@ -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;
@@ -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;
 	}
 
 }