L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-74824 core: Do not treat Stringable objects as arrays

Browse Source 
Co-authored-by: Paul Holden <[email protected]>
This commit is contained in:
Andrew Nicols
2023-06-11 17:40:55 +01:00
committed by Paul Holden
co-authored by Paul Holden
parent d508cdf111
commit fe827375f3
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/string_manager_standard.php
+2 -2
View File
@@ -363,7 +363,7 @@ class core_string_manager_standard implements core_string_manager {
if ($a !== null) {
// Process array's and objects (except lang_strings).
if (is_array($a) or (is_object($a) && !($a instanceof lang_string))) {
if (is_array($a) or (is_object($a) && !($a instanceof Stringable))) {
$a = (array)$a;
$search = array();
$replace = array();
@@ -372,7 +372,7 @@ class core_string_manager_standard implements core_string_manager {
// We do not support numeric keys - sorry!
continue;
}
if (is_array($value) or (is_object($value) && !($value instanceof lang_string))) {
if (is_array($value) or (is_object($value) && !($value instanceof Stringable))) {
// We support just string or lang_string as value.
continue;
}