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

Fixed some notices by setting default values.

namespaces
Frode Petterson 2014-03-26 08:47:44 +01:00
parent 81feec677d
commit c77b6ee19e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
h5p.classes.php
View File

@ -1384,6 +1384,7 @@ class H5PCore {
* @return string 'div' or 'iframe'. * @return string 'div' or 'iframe'.
*/ */
public function loadLibrarySemantics($name, $majorVersion, $minorVersion) { public function loadLibrarySemantics($name, $majorVersion, $minorVersion) {
$semantics = NULL;
if ($this->development_mode & H5PDevelopment::MODE_LIBRARY) { if ($this->development_mode & H5PDevelopment::MODE_LIBRARY) {
// Try to load from dev lib // Try to load from dev lib
$semantics = $this->h5pD->getSemantics($name, $majorVersion, $minorVersion); $semantics = $this->h5pD->getSemantics($name, $majorVersion, $minorVersion);
@ -1408,6 +1409,7 @@ class H5PCore {
* @return array or null. * @return array or null.
*/ */
public function loadLibrary($name, $majorVersion, $minorVersion) { public function loadLibrary($name, $majorVersion, $minorVersion) {
$library = NULL;
if ($this->development_mode & H5PDevelopment::MODE_LIBRARY) { if ($this->development_mode & H5PDevelopment::MODE_LIBRARY) {
// Try to load from dev // Try to load from dev
$library = $this->h5pD->getLibrary($name, $majorVersion, $minorVersion); $library = $this->h5pD->getLibrary($name, $majorVersion, $minorVersion);
@ -1432,7 +1434,7 @@ class H5PCore {
public function findLibraryDependencies(&$dependencies, $library, $editor = FALSE) { public function findLibraryDependencies(&$dependencies, $library, $editor = FALSE) {
foreach (array('dynamic', 'preloaded', 'editor') as $type) { foreach (array('dynamic', 'preloaded', 'editor') as $type) {
$property = $type . 'Dependencies'; $property = $type . 'Dependencies';
if ($library[$property] === NULL) { if (!isset($library[$property])) {
continue; // Skip, no such dependencies. continue; // Skip, no such dependencies.
} }