MDL-14346 database preset throws Fatal error; merged from MOODLE_19_STABLE

diff --git a/mod/data/lib.php b/mod/data/lib.php
index 519703e8f98eaad031a6cc6c31f8e3961de4bea6..87836f277cb5a1eb3e911f2910d9737c65f45a28 100755 (executable)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1896,6 +1896,9 @@ class PresetImporter {
         $settings = new StdClass();
 
         foreach ($settingsarray as $setting => $value) {
+            if (!is_array($value)) {
+                continue;
+            }
             $settings->$setting = $value[0]['#'];
         }
 
@@ -1903,8 +1906,14 @@ class PresetImporter {
         $fieldsarray = $parsedxml['preset']['#']['field'];
         $fields = array();
         foreach ($fieldsarray as $field) {
+            if (!is_array($field)) {
+                continue;
+            }
             $f = new StdClass();
             foreach ($field['#'] as $param => $value) {
+                if (!is_array($value)) {
+                    continue;
+                }
                 $f->$param = $value[0]['#'];
             }
             $f->dataid = $this->data->id;