From eaa28ad108f44f34491fe94f7a485278e3de21e8 Mon Sep 17 00:00:00 2001
From: Tymoteusz Motylewski <t.motylewski@gmail.com>
Date: Mon, 12 Feb 2018 22:02:44 +0100
Subject: [PATCH] [BUGFIX] Show ImageMagick command on failure
Install tool now shows an ImageMagick command which
failed.
Resolves: #83868
Releases: master
Change-Id: I4555d2ccdf68eea9180b8c7d2671b11e9b637709
Reviewed-on: https://review.typo3.org/55689
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Tested-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../Classes/Controller/EnvironmentController.php | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/typo3/sysext/install/Classes/Controller/EnvironmentController.php b/typo3/sysext/install/Classes/Controller/EnvironmentController.php
index cefd3e67b9d2..9139b9460867 100644
--- a/typo3/sysext/install/Classes/Controller/EnvironmentController.php
+++ b/typo3/sysext/install/Classes/Controller/EnvironmentController.php
@@ -331,6 +331,7 @@ class EnvironmentController extends AbstractController
} else {
$result = [
'status' => [$this->imageGenerationFailedMessage()],
+ 'command' => $imageProcessor->IM_commands,
];
}
return $this->getImageTestResponse($result);
@@ -363,6 +364,7 @@ class EnvironmentController extends AbstractController
} else {
$result = [
'status' => [$this->imageGenerationFailedMessage()],
+ 'command' => $imageProcessor->IM_commands,
];
}
return $this->getImageTestResponse($result);
@@ -395,6 +397,7 @@ class EnvironmentController extends AbstractController
} else {
$result = [
'status' => [$this->imageGenerationFailedMessage()],
+ 'command' => $imageProcessor->IM_commands,
];
}
return $this->getImageTestResponse($result);
@@ -427,6 +430,7 @@ class EnvironmentController extends AbstractController
} else {
$result = [
'status' => [$this->imageGenerationFailedMessage()],
+ 'command' => $imageProcessor->IM_commands,
];
}
return $this->getImageTestResponse($result);
@@ -459,6 +463,7 @@ class EnvironmentController extends AbstractController
} else {
$result = [
'status' => [$this->imageGenerationFailedMessage()],
+ 'command' => $imageProcessor->IM_commands,
];
}
return $this->getImageTestResponse($result);
@@ -495,6 +500,7 @@ class EnvironmentController extends AbstractController
} else {
$result = [
'status' => [$this->imageGenerationFailedMessage()],
+ 'command' => $imageProcessor->IM_commands,
];
}
return $this->getImageTestResponse($result);
@@ -531,6 +537,7 @@ class EnvironmentController extends AbstractController
} else {
$result = [
'status' => [$this->imageGenerationFailedMessage()],
+ 'command' => $imageProcessor->IM_commands,
];
}
return $this->getImageTestResponse($result);
@@ -813,7 +820,10 @@ class EnvironmentController extends AbstractController
'command' => $imageProcessor->IM_commands,
];
} else {
- $result['status'] = [$this->imageGenerationFailedMessage()];
+ $result = [
+ 'status' => [$this->imageGenerationFailedMessage()],
+ 'command' => $imageProcessor->IM_commands,
+ ];
}
return $this->getImageTestResponse($result);
}
--
GitLab