mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-16 14:02:32 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-62907' of https://github.com/stronk7/moodle

Browse Source
This commit is contained in:
David Monllaó 2019-04-17 11:16:44 +02:00
commit 6289f6afe3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/tool/log/classes/helper/reader.php
View File

@ -73,7 +73,7 @@ trait reader {
* @param string $other Other value
* @return mixed Decoded value
*/
public static function decode_other(string $other) {
public static function decode_other(?string $other) {
if ($other === 'N;' || preg_match('~^.:~', $other)) {
return unserialize($other);
} else {

4
admin/tool/log/store/standard/tests/store_test.php
View File

@ -374,6 +374,10 @@ class logstore_standard_store_testcase extends advanced_testcase {
$this->assertEquals($value, \logstore_standard\log\store::decode_other(json_encode($value)));
}
public function test_decode_other_with_wrongly_encoded_contents() {
$this->assertSame(null, \logstore_standard\log\store::decode_other(null));
}
/**
* List of possible values for 'other' field.
*