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

Merge branch 'manually-move-files'

namespaces
Svein-Tore Griff With 2015-02-03 14:02:54 +01:00
parent ae6329595b ae8609dd86
commit f66e6a3ce9
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
h5p.classes.php
View File

@ -412,13 +412,13 @@ interface H5PFrameworkInterface {
* Start an atomic operation against the dependency storage * Start an atomic operation against the dependency storage
*/ */
public function lockDependencyStorage(); public function lockDependencyStorage();
/** /**
* Stops an atomic operation against the dependency storage * Stops an atomic operation against the dependency storage
*/ */
public function unlockDependencyStorage(); public function unlockDependencyStorage();
/** /**
* Delete a library from database and file system * Delete a library from database and file system
* *
@ -1275,7 +1275,8 @@ class H5PStorage {
} }
$destination_path = $libraries_path . DIRECTORY_SEPARATOR . H5PCore::libraryToString($library, TRUE); $destination_path = $libraries_path . DIRECTORY_SEPARATOR . H5PCore::libraryToString($library, TRUE);
H5PCore::deleteFileTree($destination_path); H5PCore::deleteFileTree($destination_path);
rename($library['uploadDirectory'], $destination_path); $this->h5pC->copyFileTree($library['uploadDirectory'], $destination_path);
H5PCore::deleteFileTree($library['uploadDirectory']);
$library_saved = TRUE; $library_saved = TRUE;
} }
@ -1326,7 +1327,8 @@ class H5PStorage {
// Move the content folder // Move the content folder
$destination_path = $contents_path . DIRECTORY_SEPARATOR . $contentId; $destination_path = $contents_path . DIRECTORY_SEPARATOR . $contentId;
@rename($current_path, $destination_path); $this->h5pC->copyFileTree($current_path, $destination_path);
H5PCore::deleteFileTree($current_path);
// Save the content library dependencies // Save the content library dependencies
$this->h5pF->saveLibraryUsage($contentId, $librariesInUse); $this->h5pF->saveLibraryUsage($contentId, $librariesInUse);