EDUCATIC
/
h5p-php-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:h5p/h5p-php-library

HFP-2095-Fix-table-styling
Paal Joergensen 2018-09-10 11:31:40 +02:00
parent e257e5ecff 394a4aace3
commit 9e4db6cdd9
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
h5p.classes.php
View File

@ -680,6 +680,7 @@ class H5PValidator {
'author' => '/^.{1,255}$/', 'author' => '/^.{1,255}$/',
'license' => '/^(cc-by|cc-by-sa|cc-by-nd|cc-by-nc|cc-by-nc-sa|cc-by-nc-nd|pd|cr|MIT|GPL1|GPL2|GPL3|MPL|MPL2)$/', 'license' => '/^(cc-by|cc-by-sa|cc-by-nd|cc-by-nc|cc-by-nc-sa|cc-by-nc-nd|pd|cr|MIT|GPL1|GPL2|GPL3|MPL|MPL2)$/',
'description' => '/^.{1,}$/', 'description' => '/^.{1,}$/',
'metadata' => '/^(0|1)$/',
'dynamicDependencies' => array( 'dynamicDependencies' => array(
'machineName' => '/^[\w0-9\-\.]{1,255}$/i', 'machineName' => '/^[\w0-9\-\.]{1,255}$/i',
'majorVersion' => '/^[0-9]{1,5}$/', 'majorVersion' => '/^[0-9]{1,5}$/',

16
js/h5p-content-upgrade-process.js
View File

@ -25,12 +25,12 @@ H5P.ContentUpgradeProcess = (function (Version) {
} }
self.loadLibrary = loadLibrary; self.loadLibrary = loadLibrary;
self.upgrade(name, oldVersion, newVersion, params, function (err, upgradedParams) { self.upgrade(name, oldVersion, newVersion, params.params, params.metadata, function (err, upgradedParams, upgradedMetadata) {
if (err) { if (err) {
return done(err); return done(err);
} }
done(null, JSON.stringify(upgradedParams)); done(null, JSON.stringify({params: upgradedParams, metadata: upgradedMetadata}));
}); });
} }
@ -41,11 +41,11 @@ H5P.ContentUpgradeProcess = (function (Version) {
* @param {string} name * @param {string} name
* @param {Version} oldVersion * @param {Version} oldVersion
* @param {Version} newVersion * @param {Version} newVersion
* @param {Object} params Only for subcontent * @param {Object} params
* @param {Function} done Only for subcontent * @param {Object} metadata
* @param {Object} [metadata] Only for subcontent * @param {Function} done
*/ */
ContentUpgradeProcess.prototype.upgrade = function (name, oldVersion, newVersion, params, done, metadata) { ContentUpgradeProcess.prototype.upgrade = function (name, oldVersion, newVersion, params, metadata, done) {
var self = this; var self = this;
// Load library details and upgrade routines // Load library details and upgrade routines
@ -180,7 +180,7 @@ H5P.ContentUpgradeProcess = (function (Version) {
} }
// A newer version is available, upgrade params // A newer version is available, upgrade params
return self.upgrade(availableLib[0], usedVer, availableVer, params.params, function (err, upgradedParams, upgradedMetadata) { return self.upgrade(availableLib[0], usedVer, availableVer, params.params, params.metadata, function (err, upgradedParams, upgradedMetadata) {
if (!err) { if (!err) {
params.library = availableLib[0] + ' ' + availableVer.major + '.' + availableVer.minor; params.library = availableLib[0] + ' ' + availableVer.major + '.' + availableVer.minor;
params.params = upgradedParams; params.params = upgradedParams;
@ -189,7 +189,7 @@ H5P.ContentUpgradeProcess = (function (Version) {
} }
} }
done(err, params); done(err, params);
}, params.metadata); });
} }
} }
done(); done();