[TASK] Restoring default template fallback

Classes/Service/MailTemplateService.php

@@ -170,9 +170,10 @@ class MailTemplateService {
 	 * @param array $markers
 	 * @return string
 	 */
-	public static function registerTemplate($extension, $templateName, $description, array $markers) {
+	public static function registerTemplate($extension, $templateName, $templatePath, $description, array $markers) {
 
 		MailTemplateService::$registerArray[$extension][$templateName] = [
+			'templatePath' => $templatePath,
 			'description' => $description,
 			'marker' => $markers,
 			'extension' => $extension,
@@ -205,17 +206,24 @@ class MailTemplateService {
 			$this->extensionKey, $this->templateName, $this->language
 		)->getFirst();
 
-		// If there is no template for this language, use the english template
-		if ($template === NULL && $this->language !== 'en') {
-			$this->setLanguage('en');
-			$this->sendEmail();
+		// If there is no template for this language, use the default template
+		if ($template === NULL) {
+			$templatePath = self::$registerArray[$this->extensionKey][$this->templateName]['templatePath'];
+			$templateFile = $templatePath . $this->language . '.template.html';
+			if (file_exists($templateFile)) {
+				$defaultTemplateContent = file_get_contents($templatePath . $this->language . '.template.html');
+			} else {
+				// no language found and no default template
+				return FALSE;
+			}
 		}
 
-		if ($template === NULL) {
-			return FALSE;
+		if (!isset($defaultTemplateContent)) {
+			$emailView->setTemplateSource($template->getContent());
+		} else {
+			$emailView->setTemplateSource($defaultTemplateContent);
 		}
 
-		$emailView->setTemplateSource($template->getContent());
 		$emailView->assignMultiple($this->markers);
 		$emailBody = $emailView->render();