parent
a59640672d
commit
930f85e0fb
|
@ -451,13 +451,13 @@ class H5PDefaultStorage implements \H5PFileStorage {
|
||||||
return self::dirReady($this->path);
|
return self::dirReady($this->path);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if the file presave.js exists in the root of the library
|
* Check if the file presave.js exists in the root of the library
|
||||||
*
|
*
|
||||||
* @param string $libraryFolder
|
* @param string $libraryFolder
|
||||||
* @param string $developmentPath
|
* @param string $developmentPath
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function hasPresave($libraryFolder, $developmentPath = null) {
|
public function hasPresave($libraryFolder, $developmentPath = null) {
|
||||||
$path = is_null($developmentPath) ? 'libraries' . DIRECTORY_SEPARATOR . $libraryFolder : $developmentPath;
|
$path = is_null($developmentPath) ? 'libraries' . DIRECTORY_SEPARATOR . $libraryFolder : $developmentPath;
|
||||||
$filePath = realpath($this->path . DIRECTORY_SEPARATOR . $path . DIRECTORY_SEPARATOR . 'presave.js');
|
$filePath = realpath($this->path . DIRECTORY_SEPARATOR . $path . DIRECTORY_SEPARATOR . 'presave.js');
|
||||||
|
|
|
@ -2109,9 +2109,8 @@ class H5PCore {
|
||||||
|
|
||||||
// Using content dependencies
|
// Using content dependencies
|
||||||
foreach ($dependencies as $dependency) {
|
foreach ($dependencies as $dependency) {
|
||||||
$libraryName = H5PCore::libraryToString($dependency, TRUE);
|
|
||||||
if (isset($dependency['path']) === FALSE) {
|
if (isset($dependency['path']) === FALSE) {
|
||||||
$dependency['path'] = 'libraries/' . $libraryName;
|
$dependency['path'] = 'libraries/' . H5PCore::libraryToString($dependency, TRUE);
|
||||||
$dependency['preloadedJs'] = explode(',', $dependency['preloadedJs']);
|
$dependency['preloadedJs'] = explode(',', $dependency['preloadedJs']);
|
||||||
$dependency['preloadedCss'] = explode(',', $dependency['preloadedCss']);
|
$dependency['preloadedCss'] = explode(',', $dependency['preloadedCss']);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue