MDL-62907 Logging: Allow nulls on info, cases have been detected

nilo72 · Apr 17, 2019 · 65453b9 · 65453b9
1 parent 0423ed4
commit 65453b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/admin/tool/log/classes/helper/reader.php b/admin/tool/log/classes/helper/reader.php
@@ -73,7 +73,7 @@ public function get_description() {
      * @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 {

diff --git a/admin/tool/log/store/standard/tests/store_test.php b/admin/tool/log/store/standard/tests/store_test.php
@@ -374,6 +374,10 @@ public function test_decode_other($value) {
         $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.
      *