Merge pull request #224 from HanashiDev/anmerkungen

Anmerkungen
HanashiDev · Oct 19, 2023 · 8d8afc0 · 8d8afc0
2 parents d75a214 + ec7c17a
commit 8d8afc0
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 20 deletions.
diff --git a/files/acp/database/install_dev.tkirch.wsc.faq.php b/files/acp/database/install_dev.tkirch.wsc.faq.php
@@ -7,6 +7,7 @@
 use wcf\system\database\table\column\TinyintDatabaseTableColumn;
 use wcf\system\database\table\DatabaseTable;
 use wcf\system\database\table\index\DatabaseTableForeignKey;
+use wcf\system\database\table\index\DatabaseTablePrimaryIndex;
 
 return [
     DatabaseTable::create('wcf1_faq_questions')
@@ -25,6 +26,10 @@
                 ->notNull()
                 ->defaultValue(0),
         ])
+        ->indices([
+            DatabaseTablePrimaryIndex::create()
+                ->columns(['questionID']),
+        ])
         ->foreignKeys([
             DatabaseTableForeignKey::create()
                 ->columns(['categoryID'])

diff --git a/files/acp/database/update_dev.tkirch.wsc.faq_2.0.0_step1.php b/files/acp/database/update_dev.tkirch.wsc.faq_2.0.0_step1.php
diff --git a/...update_dev.tkirch.wsc.faq_2.0.0_step2.php → ...s/acp/update_dev.tkirch.wsc.faq_2.0.0.php b/...update_dev.tkirch.wsc.faq_2.0.0_step2.php → ...s/acp/update_dev.tkirch.wsc.faq_2.0.0.php
diff --git a/files/lib/action/FaqSearchAction.class.php b/files/lib/action/FaqSearchAction.class.php
@@ -15,17 +15,18 @@ class FaqSearchAction implements RequestHandlerInterface
 {
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        if ($request->getMethod() === 'GET') {
-            return new HtmlResponse(WCF::getTPL()->fetch('faqQuestionSearchDialog'));
-        } elseif ($request->getMethod() === 'POST') {
+        if ($request->getMethod() === 'GET' || $request->getMethod() === 'POST') {
             $postParameters = Helper::mapQueryParameters(
                 $request->getParsedBody(),
                 <<<'EOT'
                     array {
-                        searchString: string
+                        searchString?: string
                     }
                     EOT
             );
+            if (!isset($postParameters['searchString'])) {
+                return new HtmlResponse(WCF::getTPL()->fetch('faqQuestionSearchDialog'));
+            }
 
             $sql = "
                 SELECT          faq_questions.questionID

diff --git a/language/de.xml b/language/de.xml
@@ -56,6 +56,7 @@
 		<category name="wcf.faq.bbcode">
 			<item name="wcf.faq.bbcode.noPermissions"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du verfügst{else}Sie verfügen{/if} nicht über die notwendigen Zugriffsrechte, um diese FAQ-Frage zu sehen.]]></item>
 			<item name="wcf.faq.bbcode.faqEntry"><![CDATA[FAQ-Eintrag]]></item>
+			<item name="wcf.faq.bbcode.title"><![CDATA[FAQ:]]></item>
 		</category>
 		<category name="wcf.search.type">
 			<item name="wcf.search.type.dev.tkirch.wsc.faq.question"><![CDATA[FAQ]]></item>

diff --git a/language/en.xml b/language/en.xml
@@ -56,6 +56,7 @@
 		<category name="wcf.faq.bbcode">
 			<item name="wcf.faq.bbcode.noPermissions"><![CDATA[You are not authorized to view this FAQ question.]]></item>
 			<item name="wcf.faq.bbcode.faqEntry"><![CDATA[FAQ entry]]></item>
+			<item name="wcf.faq.bbcode.title"><![CDATA[FAQ:]]></item>
 		</category>
 		<category name="wcf.search.type">
 			<item name="wcf.search.type.dev.tkirch.wsc.faq.question"><![CDATA[FAQ]]></item>

diff --git a/package.xml b/package.xml
@@ -41,7 +41,7 @@
 		<instruction type="acpMenu"/>
 		<instruction type="language"/>
 		<instruction type="templateListener"/>
-		<instruction type="database" run="standalone">acp/database/update_dev.tkirch.wsc.faq_2.0.0_step1.php</instruction>
-		<instruction type="script" run="standalone">acp/database/update_dev.tkirch.wsc.faq_2.0.0_step2.php</instruction>
+		<instruction type="database" run="standalone">acp/database/install_dev.tkirch.wsc.faq.php</instruction>
+		<instruction type="script" run="standalone">acp/database/update_dev.tkirch.wsc.faq_2.0.0.php</instruction>
 	</instructions>
 </package>
diff --git a/templates/faqBBCode.tpl b/templates/faqBBCode.tpl
@@ -8,7 +8,7 @@
 
 		<div class="faqBBcodeBoxTitle">
 			<span class="faqBBcodeBoxTitle">
-				FAQ: <a href="{$question->getLink()}">{$question->getTitle()}</a>
+				{lang}wcf.faq.bbcode.title{/lang} <a href="{$question->getLink()}">{$question->getTitle()}</a>
 			</span>
 		</div>