From fa0d40a8cb53a344f11be8f37a5d613bca1846e7 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Sat, 24 Nov 2018 15:05:48 +0100 Subject: [PATCH] Fix devtools package syncing errors See #2616 --- .../lib/system/devtools/pip/DevtoolsPip.class.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 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 26f92a9c89..6c64cfb01f 100644 --- a/wcfsetup/install/files/lib/system/devtools/pip/DevtoolsPip.class.php +++ b/wcfsetup/install/files/lib/system/devtools/pip/DevtoolsPip.class.php @@ -315,14 +315,12 @@ class DevtoolsPip extends DatabaseObjectDecorator { break; case 'language': - $filename = "wcfsetup/install/lang/{$target}"; - $tar->registerFile($filename, $project->path . $filename); + $tar->registerFile($target, $project->path . 'wcfsetup/install/lang/' . $target); break; default: - $filename = "com.woltlab.wcf/{$target}"; - $tar->registerFile($filename, $project->path . $filename); + $tar->registerFile($target, $project->path . 'com.woltlab.wcf/' . $target); break; } @@ -389,12 +387,10 @@ class DevtoolsPip extends DatabaseObjectDecorator { default: if (strpos($defaultFilename, '*') !== false) { - $filename = preg_replace('~\*.*$~', $target, $defaultFilename); - $tar->registerFile($filename, $project->path . $filename); + $tar->registerFile($target, $project->path . preg_replace('~\*.*$~', $target, $defaultFilename)); } else { - $filename = $target; - $tar->registerFile($filename, $project->path . $filename); + $tar->registerFile($target, $project->path . $target); } break; -- 2.20.1