This commit is contained in:
Jean-Christian Paul Denis 2023-03-18 17:20:48 +01:00
parent 0bd77b1399
commit 88bd4e0db6
Signed by: JcDenis
GPG Key ID: 1B5B8C5B90B6C951
2 changed files with 9 additions and 9 deletions

View File

@ -70,15 +70,15 @@ class Core
$zip_root_dir = $zip->getRootDir(); $zip_root_dir = $zip->getRootDir();
if ($zip_root_dir != false) { if ($zip_root_dir != false) {
$target = dirname($zip_file); $target = dirname($zip_file);
$path = $target . DIRECTORY_SEPARATOR . $zip_root_dir; $path = $target . DIRECTORY_SEPARATOR . $zip_root_dir;
$define = $zip_root_dir . '/' . dcModules::MODULE_FILE_DEFINE; $define = $zip_root_dir . '/' . dcModules::MODULE_FILE_DEFINE;
$init = $zip_root_dir . '/' . dcModules::MODULE_FILE_INIT; $init = $zip_root_dir . '/' . dcModules::MODULE_FILE_INIT;
} else { } else {
$target = dirname($zip_file) . DIRECTORY_SEPARATOR . preg_replace('/\.([^.]+)$/', '', basename($zip_file)); $target = dirname($zip_file) . DIRECTORY_SEPARATOR . preg_replace('/\.([^.]+)$/', '', basename($zip_file));
$path = $target; $path = $target;
$define = dcModules::MODULE_FILE_DEFINE; $define = dcModules::MODULE_FILE_DEFINE;
$init = dcModules::MODULE_FILE_INIT; $init = dcModules::MODULE_FILE_INIT;
} }
if ($zip->isEmpty()) { if ($zip->isEmpty()) {

View File

@ -28,7 +28,7 @@ class Zip extends \Dotclear\Helper\File\Zip\Zip
* @param string $name The name * @param string $name The name
* @param string $file The file * @param string $file The file
* @param int|null $mtime The mtime * @param int|null $mtime The mtime
* *
* @return void * @return void
*/ */
protected function writeFile(string $name, string $file, ?int $mtime) protected function writeFile(string $name, string $file, ?int $mtime)