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

namespaces
Pål Jørgensen 2013-07-08 17:12:48 +02:00
commit 112e1e1108
1 changed files with 1 additions and 6 deletions

View File

@ -850,14 +850,9 @@ class H5PStorage {
$library['saveDependencies'] = FALSE; $library['saveDependencies'] = FALSE;
continue; continue;
} }
// If we're not allowed to save, we should not be here at all. But just
// in case, we check again.
if (! $this->h5pF->isAllowedLibraryUpdate($library)) {
continue;
}
$this->h5pF->saveLibraryData($library, $new); $this->h5pF->saveLibraryData($library, $new);
$current_path = $this->h5pF->getUploadedH5pFolderPath() . DIRECTORY_SEPARATOR . $key; $current_path = $this->h5pF->getUploadedH5pFolderPath() . DIRECTORY_SEPARATOR . $key;
$destination_path = $this->h5pF->getH5pPath() . DIRECTORY_SEPARATOR . 'libraries' . DIRECTORY_SEPARATOR . $this->h5pC->libraryToString($library, TRUE); $destination_path = $this->h5pF->getH5pPath() . DIRECTORY_SEPARATOR . 'libraries' . DIRECTORY_SEPARATOR . $this->h5pC->libraryToString($library, TRUE);
$this->h5pC->delTree($destination_path); $this->h5pC->delTree($destination_path);