JI-848 Fix bug in content upgrade for metadata

locallib.php

@@ -315,13 +315,17 @@ function hvp_content_upgrade_progress($libraryid) {
         // Update params.
         $params = json_decode($params);
         foreach ($params as $id => $param) {
-            $DB->update_record('hvp', (object) array(
+            $upgraded = json_decode($param);
+
+            $fields = array_merge(\H5PMetadata::toDBArray($upgraded->metadata, false), array(
                 'id' => $id,
                 'main_library_id' => $tolibrary->id,
-                'json_content' => $param,
+                'json_content' => json_encode($upgraded->params),
                 'filtered' => ''
             ));
 
+            $DB->update_record('hvp', $fields);
+
             // Log content upgrade successful.
             new \mod_hvp\event(
                 'content', 'upgrade',
@@ -331,21 +335,6 @@ function hvp_content_upgrade_progress($libraryid) {
         }
     }
 
-    // Get updated extras.
-    $extras = filter_input(INPUT_POST, 'extras');
-    if ($extras !== null) {
-        // Update extras.
-        $extras = json_decode($extras);
-        if (isset($extras->metadata)) {
-            $fields = \H5PMetadata::toDBArray($extras->metadata, false);
-            $fields['id'] = $id;
-            $fields['name'] = $fields['title'];
-            unset($fields['title']);
-
-            $DB->update_record('hvp', (object) $fields);
-        }
-    }
-
     // Get number of contents for this library.
     $out->left = $interface->getNumContent($libraryid);
 
@@ -360,8 +349,9 @@ function hvp_content_upgrade_progress($libraryid) {
         );
 
         foreach ($results as $content) {
-            $out->params[$content->id] = $content->params;
-            $out->metadata[$content->id] = \H5PMetadata::toJSON($content);
+          $out->params[$content->id] =
+            '{"params":' . $content->params .
+            ',"metadata":' . \H5PMetadata::toJSON($content) . '}';
         }
     }