diff options
author | Stefan Giehl <stefan@matomo.org> | 2021-05-27 04:58:30 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-27 04:58:30 +0300 |
commit | c973567705a0065fdd7d7c7b11b80f1f0f1be350 (patch) | |
tree | 89947dbce864ac48389c742fce31d30106eebada /core/CronArchive.php | |
parent | 70b05de003487a31495bb9927017606a2faab7dd (diff) |
Update PHP extension requirements & deprecate Common::mb_* methods (#16754)
* Require polyfill for mbstring and iconv
* remove mbstring methods from upgrade.php
* remove checks for some php extensions
* deprecate Common::mb_* methods, as we can directly use mb_* functions instead
* updates expected test files
* Directly use mb_* methods in favor of Common::mb_*
* Update expected screenshot
Co-authored-by: diosmosis <diosmosis@users.noreply.github.com>
Diffstat (limited to 'core/CronArchive.php')
-rw-r--r-- | core/CronArchive.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/CronArchive.php b/core/CronArchive.php index ec52fe9a31..9e5ffb365b 100644 --- a/core/CronArchive.php +++ b/core/CronArchive.php @@ -673,11 +673,11 @@ class CronArchive { if (!defined('PIWIK_ARCHIVE_NO_TRUNCATE')) { $m = str_replace(array("\n", "\t"), " ", $m); - if (Common::mb_strlen($m) > self::TRUNCATE_ERROR_MESSAGE_SUMMARY) { + if (mb_strlen($m) > self::TRUNCATE_ERROR_MESSAGE_SUMMARY) { $numCharactersKeepFromEnd = 100; - $m = Common::mb_substr($m, 0, self::TRUNCATE_ERROR_MESSAGE_SUMMARY - $numCharactersKeepFromEnd) + $m = mb_substr($m, 0, self::TRUNCATE_ERROR_MESSAGE_SUMMARY - $numCharactersKeepFromEnd) . ' ... ' . - Common::mb_substr($m, -1 * $numCharactersKeepFromEnd); + mb_substr($m, -1 * $numCharactersKeepFromEnd); } } $this->errors[] = $m; |