Merge branch 'master' into stable

semantics-font
Frode Petterson 2014-11-27 11:24:15 +01:00
commit 746f6417a4
1 changed files with 1 additions and 1 deletions

View File

@ -1465,7 +1465,7 @@ Class H5PExport {
// Create new zip instance. // Create new zip instance.
$zip = new ZipArchive(); $zip = new ZipArchive();
$zip->open($zipPath, ZIPARCHIVE::CREATE); $zip->open($zipPath, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE););
// Get all files and folders in $tempPath // Get all files and folders in $tempPath
$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($tempPath . DIRECTORY_SEPARATOR)); $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($tempPath . DIRECTORY_SEPARATOR));