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

Merge branch 'release'

pull/18/head
Frode Petterson 2016-04-12 14:39:59 +02:00
parent 471a1ea6a8 7474916f3a
commit cdfb810501
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
h5p.classes.php
View File

@ -1468,7 +1468,7 @@ class H5PStorage {
* The main id of the new content (used in frameworks that support revisioning) * The main id of the new content (used in frameworks that support revisioning)
*/ */
public function copyPackage($contentId, $copyFromId, $contentMainId = NULL) { 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); $this->h5pF->copyLibraryUsage($contentId, $copyFromId, $contentMainId);
} }
} }
@ -1974,9 +1974,9 @@ class H5PCore {
// Get aggregated files for assets // Get aggregated files for assets
$key = self::getDependenciesHash($dependencies); $key = self::getDependenciesHash($dependencies);
$files = $this->fs->getCachedAssets($key); $cachedAssets = $this->fs->getCachedAssets($key);
if ($files) { if ($cachedAssets !== NULL) {
return $files; // Using cached assets return array_merge($files, $cachedAssets); // Using cached assets
} }
} }