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

Merge branch 'master' of b.amendor.com:h5p 

Conflicts:
	library/h5p.classes.php
namespaces
Frank Ronny Larsen 2013-07-09 15:16:36 +02:00
parent ab316a163c 9a12f49aea
commit d57f4cb109
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
h5p.classes.php
View File

@ -180,6 +180,7 @@ interface H5PFrameworkInterface {
*/
public function saveLibraryUsage($contentId, $librariesInUse);
/**
* Loads a library
*
@ -1404,13 +1405,13 @@ class H5PContentValidator {
public function validateLibrary(&$value, $semantics) {
// Check if provided library is within allowed options
if (in_array($value->library, $semantics->options)) {
if (isset($semanticsCache[$value->library])) {
$librarySemantics = $semanticsCache[$value->library];
if (isset($this->semanticsCache[$value->library])) {
$librarySemantics = $this->semanticsCache[$value->library];
}
else {
$libspec = $this->h5pC->libraryFromString($value->library);
$librarySemantics = $this->h5pF->getLibrarySemantics($libspec['machineName'], $libspec['majorVersion'], $libspec['minorVersion']);
$semanticsCache[$value->library] = $librarySemantics;
$this->semanticsCache[$value->library] = $librarySemantics;
}
$this->validateBySemantics($value->params, $librarySemantics);
}