From d71233fc5c07167595ec05dce5ce3167f6b23e98 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Sat, 24 Nov 2018 09:36:56 +0100 Subject: [PATCH] Fix importing application-specific PIP files See #2616 --- .../lib/system/devtools/pip/DevtoolsPip.class.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/wcfsetup/install/files/lib/system/devtools/pip/DevtoolsPip.class.php b/wcfsetup/install/files/lib/system/devtools/pip/DevtoolsPip.class.php index 1c762ecb50..26f92a9c89 100644 --- a/wcfsetup/install/files/lib/system/devtools/pip/DevtoolsPip.class.php +++ b/wcfsetup/install/files/lib/system/devtools/pip/DevtoolsPip.class.php @@ -252,7 +252,9 @@ class DevtoolsPip extends DatabaseObjectDecorator { $tar = $project->getPackageArchive()->getTar(); $tar->reset(); - $instructions = []; + $instructions = [ + 'value' => $target + ]; if ($project->isCore()) { switch ($pluginName) { @@ -310,24 +312,18 @@ class DevtoolsPip extends DatabaseObjectDecorator { } } - $instructions['value'] = $defaultFilename; - break; case 'language': $filename = "wcfsetup/install/lang/{$target}"; $tar->registerFile($filename, $project->path . $filename); - $instructions['value'] = $filename; - break; default: $filename = "com.woltlab.wcf/{$target}"; $tar->registerFile($filename, $project->path . $filename); - $instructions['value'] = $filename; - break; } } @@ -389,8 +385,6 @@ class DevtoolsPip extends DatabaseObjectDecorator { } } - $instructions['value'] = $defaultFilename; - break; default: @@ -403,8 +397,6 @@ class DevtoolsPip extends DatabaseObjectDecorator { $tar->registerFile($filename, $project->path . $filename); } - $instructions['value'] = $filename; - break; } } -- 2.20.1