Skip to content
Snippets Groups Projects
Commit e58bb4e5 authored by Nicole Cordes's avatar Nicole Cordes Committed by Christian Kuhn
Browse files

[BUGFIX] Prevent wrong information after extension upload

If you upload an extension it is extracted and installed in separate
steps. If the extraction was successful a flash message is rendered.
If the installation fails the whole extension is removed again but the
flash message is still visible. This patch separates flash message output
for upload and installation process.

Releases: master, 6.2
Resolves: #66729
Change-Id: I6d84d8ecebd55a989a34c1024300916e33af66a7
Reviewed-on: http://review.typo3.org/39181


Reviewed-by: default avatarJan Helke <typo3@helke.de>
Tested-by: default avatarJan Helke <typo3@helke.de>
Reviewed-by: default avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: default avatarChristian Kuhn <lolli@schwarzbu.ch>
parent c41ccdd1
No related merge requests found
......@@ -97,13 +97,14 @@ class UploadExtensionFileController extends AbstractController {
);
}
$extensionData = $this->extractExtensionFromFile($tempFile, $fileName, $overwrite);
$this->addFlashMessage(
htmlspecialchars($this->translate('extensionList.uploadFlashMessage.message', array($extensionData['extKey']))),
htmlspecialchars($this->translate('extensionList.uploadFlashMessage.title')),
FlashMessage::OK
);
$emConfiguration = $this->configurationUtility->getCurrentConfiguration('extensionmanager');
if ($emConfiguration['automaticInstallation']['value']) {
if (!$emConfiguration['automaticInstallation']['value']) {
$this->addFlashMessage(
htmlspecialchars($this->translate('extensionList.uploadFlashMessage.message', array($extensionData['extKey']))),
htmlspecialchars($this->translate('extensionList.uploadFlashMessage.title')),
FlashMessage::OK
);
} else {
$this->activateExtension($extensionData['extKey']);
$this->addFlashMessage(
htmlspecialchars($this->translate('extensionList.installedFlashMessage.message', array($extensionData['extKey']))),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment