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

namespaces
Pål Jørgensen 2014-11-03 07:00:05 +01:00
parent 48f7969ff9 7c3ddea71a
commit 48dd1333a8
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
h5p.classes.php
View File

@ -1526,7 +1526,7 @@ class H5PCore {
public static $coreApi = array( public static $coreApi = array(
'majorVersion' => 1, 'majorVersion' => 1,
'minorVersion' => 3 'minorVersion' => 4
); );
public static $styles = array( public static $styles = array(
'styles/h5p.css', 'styles/h5p.css',
@ -1648,6 +1648,9 @@ class H5PCore {
// Update content dependencies. // Update content dependencies.
$content['dependencies'] = $validator->getDependencies(); $content['dependencies'] = $validator->getDependencies();
// Sometimes the parameters are filtered before content has been created
if ($content['id']) {
$this->h5pF->deleteLibraryUsage($content['id']); $this->h5pF->deleteLibraryUsage($content['id']);
$this->h5pF->saveLibraryUsage($content['id'], $content['dependencies']); $this->h5pF->saveLibraryUsage($content['id'], $content['dependencies']);
@ -1661,6 +1664,7 @@ class H5PCore {
// Cache. // Cache.
$this->h5pF->setFilteredParameters($content['id'], $params); $this->h5pF->setFilteredParameters($content['id'], $params);
}
return $params; return $params;
} }

7
js/h5p.js
View File

@ -1099,3 +1099,10 @@ if (H5P.jQuery) {
} }
}); });
} }
/**
* Mimics how php's htmlspecialchars works (the way we use it)
*/
H5P.htmlSpecialChars = function(string) {
return string.toString().replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/'/g, '&#039;').replace(/"/g, '&quot;');
};