fix possible template bug

HanashiDev · Sep 4, 2024 · f393c9f · f393c9f
1 parent 6f0b909
commit f393c9f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 4 deletions.
diff --git a/files/lib/system/endpoint/controller/hanashi/questions/search/GetSearch.class.php b/files/lib/system/endpoint/controller/hanashi/questions/search/GetSearch.class.php
@@ -29,7 +29,7 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
         $questionIDs = $this->getQuestionsIDs($parameters->query);
 
         return new JsonResponse([
-            'template' => WCF::getTPL()->fetch('faqQuestionSearchResult', 'wcf', [
+            'template' => WCF::getTPL()->fetch('shared_faqQuestionSearchResult', 'wcf', [
                 'questions' => $this->getQuestions($questionIDs),
             ]),
         ]);

diff --git a/files/lib/system/endpoint/controller/hanashi/questions/search/RenderSearch.class.php b/files/lib/system/endpoint/controller/hanashi/questions/search/RenderSearch.class.php
@@ -17,7 +17,7 @@ final class RenderSearch implements IController
     public function __invoke(ServerRequestInterface $request, array $variables): ResponseInterface
     {
         return new JsonResponse([
-            'template' => WCF::getTPL()->fetch('faqQuestionSearchDialog', 'wcf'),
+            'template' => WCF::getTPL()->fetch('shared_faqQuestionSearchDialog', 'wcf'),
         ]);
     }
 }
diff --git a/package.xml b/package.xml
@@ -6,8 +6,8 @@
 		<packagename language="de">Simple FAQ</packagename>
 		<packagedescription>A simple and powerful FAQ for your WSC.</packagedescription>
 		<packagedescription language="de">Ein simples und leistungsstarkes FAQ für Ihr WSC.</packagedescription>
-		<version>2.2.1</version>
-		<date>2024-08-31</date>
+		<version>2.2.1 dev 1</version>
+		<date>2024-09-04</date>
 	</packageinformation>
 	<authorinformation>
 		<author>Hanashi Development, Titus Kirch</author>
@@ -37,6 +37,8 @@
 		<instruction type="database" run="standalone">acp/database/install_dev.tkirch.wsc.faq.php</instruction>
 	</instructions>
 	<instructions type="update" fromversion="2.2.0">
+		<instruction type="file"/>
+		<instruction type="template"/>
 		<instruction type="templateListener"/>
 	</instructions>
 	<instructions type="update" fromversion="2.1.*">

diff --git a/templateListener.xml b/templateListener.xml
@@ -7,6 +7,12 @@
 			<eventname>wysiwyg</eventname>
 			<templatecode><![CDATA[{include file='__faqWysiwygJavaScript'}]]></templatecode>
 		</templatelistener>
+		<templatelistener name="faqWysiwygBeforeEditorJavaScriptAdmin">
+			<environment>admin</environment>
+			<templatename>shared_wysiwyg</templatename>
+			<eventname>wysiwyg</eventname>
+			<templatecode><![CDATA[{include file='shared_faqWysiwygJavaScript'}]]></templatecode>
+		</templatelistener>
 		<templatelistener name="searchAreaFaqSettings">
 			<environment>user</environment>
 			<templatename>pageHeaderSearch</templatename>

diff --git a/templates/faqQuestionSearchDialog.tpl → templates/shared_faqQuestionSearchDialog.tpl b/templates/faqQuestionSearchDialog.tpl → templates/shared_faqQuestionSearchDialog.tpl
diff --git a/templates/faqQuestionSearchResult.tpl → templates/shared_faqQuestionSearchResult.tpl b/templates/faqQuestionSearchResult.tpl → templates/shared_faqQuestionSearchResult.tpl
diff --git a/templates/__faqWysiwygJavaScript.tpl → templates/shared_faqWysiwygJavaScript.tpl b/templates/__faqWysiwygJavaScript.tpl → templates/shared_faqWysiwygJavaScript.tpl