From 0c220f89201a4da9454aa28f06d644f51a5b5bc4 Mon Sep 17 00:00:00 2001 From: Paul Ilea Date: Fri, 18 May 2018 18:42:41 +0300 Subject: [PATCH] [BUGFIX] Reset template for current domain only --- Classes/Controller/MailController.php | 3 ++- Classes/Domain/Repository/TemplateRepository.php | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Classes/Controller/MailController.php b/Classes/Controller/MailController.php index ab6e7e4..32814af 100644 --- a/Classes/Controller/MailController.php +++ b/Classes/Controller/MailController.php @@ -361,7 +361,8 @@ class MailController extends ActionController { * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException */ public function resetAction($template, $extensionKey) { - $this->templateRepository->deleteTemplate($extensionKey, $template); + $pid = (int) GeneralUtility::_GP('id'); + $this->templateRepository->deleteTemplate($extensionKey, $template, $pid); $message = LocalizationUtility::translate('backend.template_reset', 'sg_mail'); $this->addFlashMessage($message, '', FlashMessage::OK); diff --git a/Classes/Domain/Repository/TemplateRepository.php b/Classes/Domain/Repository/TemplateRepository.php index 4c2b6d4..b72e3bc 100644 --- a/Classes/Domain/Repository/TemplateRepository.php +++ b/Classes/Domain/Repository/TemplateRepository.php @@ -63,16 +63,18 @@ class TemplateRepository extends AbstractRepository { /** * Delete a Template * - * @param $extensionKey - * @param $templateName + * @param string $extensionKey + * @param string $templateName + * @param int $pid */ - public function deleteTemplate($extensionKey, $templateName) { + public function deleteTemplate($extensionKey, $templateName, $pid) { /** @var $databaseConnection DatabaseConnection */ $databaseConnection = $GLOBALS['TYPO3_DB']; $tableName = 'tx_sgmail_domain_model_template'; $where = 'extension_key = ' . $databaseConnection->fullQuoteStr($extensionKey, $tableName); - $where.= ' AND template_name = ' . $databaseConnection->fullQuoteStr($templateName, $tableName); + $where .= ' AND template_name = ' . $databaseConnection->fullQuoteStr($templateName, $tableName); + $where .= ' AND pid = ' . (int) $pid; $databaseConnection->exec_DELETEquery($tableName, $where); } -- GitLab