From cfc5057ebf594c606d49e9783359d270ef1d42c5 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Sat, 28 Sep 2019 14:48:06 +0200 Subject: [PATCH] Show proper error message on pip pages of non-installed packages --- .../lib/acp/form/DevtoolsProjectPipEntryAddForm.class.php | 4 +++- .../lib/acp/page/DevtoolsProjectPipEntryListPage.class.php | 4 +++- .../files/lib/data/devtools/project/DevtoolsProject.class.php | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/wcfsetup/install/files/lib/acp/form/DevtoolsProjectPipEntryAddForm.class.php b/wcfsetup/install/files/lib/acp/form/DevtoolsProjectPipEntryAddForm.class.php index 874ffe024e..3d98c50837 100644 --- a/wcfsetup/install/files/lib/acp/form/DevtoolsProjectPipEntryAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/DevtoolsProjectPipEntryAddForm.class.php @@ -78,7 +78,9 @@ class DevtoolsProjectPipEntryAddForm extends AbstractFormBuilderForm { throw new IllegalLinkException(); } - $this->project->validatePackageXml(); + if ($this->project->validatePackageXml() !== '') { + throw new IllegalLinkException(); + } if (isset($_REQUEST['pip'])) $this->pip = StringUtil::trim($_REQUEST['pip']); diff --git a/wcfsetup/install/files/lib/acp/page/DevtoolsProjectPipEntryListPage.class.php b/wcfsetup/install/files/lib/acp/page/DevtoolsProjectPipEntryListPage.class.php index 6ca1d61eee..4297e41053 100644 --- a/wcfsetup/install/files/lib/acp/page/DevtoolsProjectPipEntryListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/DevtoolsProjectPipEntryListPage.class.php @@ -136,7 +136,9 @@ class DevtoolsProjectPipEntryListPage extends AbstractPage { throw new IllegalLinkException(); } - $this->project->validatePackageXml(); + if ($this->project->validatePackageXml() !== '') { + throw new IllegalLinkException(); + } if (isset($_REQUEST['pip'])) $this->pip = StringUtil::trim($_REQUEST['pip']); diff --git a/wcfsetup/install/files/lib/data/devtools/project/DevtoolsProject.class.php b/wcfsetup/install/files/lib/data/devtools/project/DevtoolsProject.class.php index 617c79555a..1602bebecc 100644 --- a/wcfsetup/install/files/lib/data/devtools/project/DevtoolsProject.class.php +++ b/wcfsetup/install/files/lib/data/devtools/project/DevtoolsProject.class.php @@ -123,7 +123,7 @@ class DevtoolsProject extends DatabaseObject { if ($this->getPackage() === null) { return WCF::getLanguage()->getDynamicVariable('wcf.acp.devtools.project.path.error.notInstalled', [ - 'package' => $this->packageArchive->getPackageInfo('name') + 'project' => $this ]); } -- 2.20.1