Merge branch 'release'
commit
cdfb810501
|
@ -1468,7 +1468,7 @@ class H5PStorage {
|
|||
* The main id of the new content (used in frameworks that support revisioning)
|
||||
*/
|
||||
public function copyPackage($contentId, $copyFromId, $contentMainId = NULL) {
|
||||
$this->h5pC->fs->cloneContent($contentId, $newContentId);
|
||||
$this->h5pC->fs->cloneContent($copyFromId, $contentId);
|
||||
$this->h5pF->copyLibraryUsage($contentId, $copyFromId, $contentMainId);
|
||||
}
|
||||
}
|
||||
|
@ -1974,9 +1974,9 @@ class H5PCore {
|
|||
// Get aggregated files for assets
|
||||
$key = self::getDependenciesHash($dependencies);
|
||||
|
||||
$files = $this->fs->getCachedAssets($key);
|
||||
if ($files) {
|
||||
return $files; // Using cached assets
|
||||
$cachedAssets = $this->fs->getCachedAssets($key);
|
||||
if ($cachedAssets !== NULL) {
|
||||
return array_merge($files, $cachedAssets); // Using cached assets
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue