mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-77102' of https://github.com/paulholden/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2023-02-16 11:50:54 +08:00
commit 55574803c1
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod/wiki/classes/external.php
View File

@ -508,15 +508,7 @@ class mod_wiki_external extends external_api {
$retpage['contentformat'] = $contentformat;
} else {
// Return the size of the content.
$retpage['contentsize'] = strlen($cachedcontent);
// TODO: Remove this block of code once PHP 8.0 is the min version supported.
// For PHP < 8.0, if strlen() was overloaded, calculate
// the bytes using mb_strlen(..., '8bit').
if (PHP_VERSION_ID < 80000) {
if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
$retpage['contentsize'] = mb_strlen($cachedcontent, '8bit');
}
}
$retpage['contentsize'] = \core_text::strlen($cachedcontent);
}
$returnedpages[] = $retpage;

10
mod/wiki/tests/externallib_test.php
View File

@ -647,15 +647,7 @@ class externallib_test extends externallib_advanced_testcase {
// Check that WS doesn't return page content if includecontent is false, it returns the size instead.
foreach ($expectedpages as $i => $expectedpage) {
$expectedpages[$i]['contentsize'] = strlen($expectedpages[$i]['cachedcontent']);
// TODO: Remove this block of code once PHP 8.0 is the min version supported.
// For PHP < 8.0, if strlen() was overloaded, calculate
// the bytes using mb_strlen(..., '8bit').
if (PHP_VERSION_ID < 80000) {
if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
$expectedpages[$i]['contentsize'] = mb_strlen($expectedpages[$i]['cachedcontent'], '8bit');
}
}
$expectedpages[$i]['contentsize'] = \core_text::strlen($expectedpages[$i]['cachedcontent']);
unset($expectedpages[$i]['cachedcontent']);
unset($expectedpages[$i]['contentformat']);
}