[TASK] Removing merge conflicts

Classes/Service/MailTemplateService.php

@@ -168,15 +168,17 @@ class MailTemplateService {
 	 * @param string $templatePath
 	 * @param string $description
 	 * @param array $markers
-	 * @return void
 	 */
-	public static function registerTemplate($extension, $templateName, $templatePath, $description, array $markers) {
+	public static function registerTemplate(
+		$extension, $templateName, $templatePath, $description, array $markers, array $subjects
+	) {
 		MailTemplateService::$registerArray[$extension][$templateName] = [
 			'templatePath' => $templatePath,
 			'description' => $description,
 			'marker' => $markers,
 			'extension' => $extension,
-			'templateName' => $templateName
+			'templateName' => $templateName,
+			'subjects' => $subjects
 		];
 	}
 
@@ -233,7 +235,9 @@ class MailTemplateService {
 			$this->mailMessage->setSubject($template->getSubject());
 		} else {
 			$emailView->setTemplateSource($defaultTemplateContent);
-			$this->mailMessage->setSubject($subject);
+			$this->mailMessage->setSubject(
+				self::$registerArray[$this->extensionKey][$this->templateName]['subjects'][$this->language]
+			);
 		}
 
 		$emailView->assignMultiple($this->markers);