From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 18 May 2022 14:17:39 +0000 (+0200)
Subject: Removed nameExactly option
X-Git-Tag: 5.5.0_Beta_3~4^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4d3964c244c9d0155b2b3724dbcdb814591bd360;p=GitHub%2FWoltLab%2FWCF.git

Removed nameExactly option
---

diff --git a/com.woltlab.wcf/templates/search.tpl b/com.woltlab.wcf/templates/search.tpl
index 8efade706b..a3233bbfd8 100644
--- a/com.woltlab.wcf/templates/search.tpl
+++ b/com.woltlab.wcf/templates/search.tpl
@@ -31,7 +31,6 @@
 					<dt><label for="searchAuthor">{lang}wcf.search.author{/lang}</label></dt>
 					<dd>
 						<input type="text" id="searchAuthor" name="username" value="" class="medium" maxlength="255" autocomplete="off">
-						<label><input type="checkbox" name="nameExactly" value="1"> {lang}wcf.search.matchExactly{/lang}</label>
 						{* deprecated *}{event name='authorOptions'}
 					</dd>
 				</dl>
diff --git a/wcfsetup/install/files/lib/data/search/SearchAction.class.php b/wcfsetup/install/files/lib/data/search/SearchAction.class.php
index b830e94ddd..18d7caa8c5 100644
--- a/wcfsetup/install/files/lib/data/search/SearchAction.class.php
+++ b/wcfsetup/install/files/lib/data/search/SearchAction.class.php
@@ -54,7 +54,6 @@ class SearchAction extends AbstractDatabaseObjectAction
         $this->readString('q', true);
         $this->readString('type', true);
         $this->readString('username', true);
-        $this->readBoolean('nameExactly', true);
         $this->readBoolean('subjectOnly', true);
         $this->readString('startDate', true);
         $this->readString('endDate', true);
diff --git a/wcfsetup/install/files/lib/system/search/SearchHandler.class.php b/wcfsetup/install/files/lib/system/search/SearchHandler.class.php
index 781638dbef..523ea0f315 100644
--- a/wcfsetup/install/files/lib/system/search/SearchHandler.class.php
+++ b/wcfsetup/install/files/lib/system/search/SearchHandler.class.php
@@ -224,9 +224,9 @@ final class SearchHandler
             if (!empty($this->parameters['username'])) {
                 $sql = "SELECT  userID
                         FROM    wcf" . WCF_N . "_user
-                        WHERE   username " . (!empty($this->parameters['nameExactly']) ? "= ?" : "LIKE ?");
+                        WHERE   username = ?";
                 $statement = WCF::getDB()->prepareStatement($sql, 100);
-                $statement->execute([$this->parameters['username'] . (empty($this->parameters['nameExactly']) ? '%' : '')]);
+                $statement->execute([$this->parameters['username']]);
                 $this->userIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
             }
 
@@ -311,7 +311,6 @@ final class SearchHandler
             'additionalData' => $this->getAdditionalData(),
             'sortField' => $this->parameters['sortField'] ?? '',
             'sortOrder' => $this->parameters['sortOrder'] ?? '',
-            'nameExactly' => $this->parameters['nameExactly'] ?? '',
             'subjectOnly' => $this->parameters['subjectOnly'] ?? '',
             'startDate' => $this->parameters['startDate'] ?? '',
             'endDate' => $this->parameters['endDate'] ?? '',
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 7f1d1f446e..27471990f1 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -4508,7 +4508,6 @@ Dateianhänge:
 	<category name="wcf.search">
 		<item name="wcf.search.author"><![CDATA[Suche nach Autor]]></item>
 		<item name="wcf.search.extended"><![CDATA[Erweiterte Suche]]></item>
-		<item name="wcf.search.matchExactly"><![CDATA[Exakter Treffer]]></item>
 		<item name="wcf.search.period"><![CDATA[Im Zeitraum]]></item>
 		<item name="wcf.search.sortBy"><![CDATA[Sortierung]]></item>
 		<item name="wcf.search.sortBy.relevance"><![CDATA[Relevanz]]></item>
@@ -5618,5 +5617,6 @@ Benachrichtigungen auf <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phra
 	<item name="wcf.user.profile.customization" />
 	<item name="wcf.acp.option.enable_desktop_notifications"/>
 	<item name="wcf.acp.option.enable_desktop_notifications.description"/>
+	<item name="wcf.search.matchExactly" />
 </delete>
 </language>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index c9e8dcd267..bea06f9691 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -4510,7 +4510,6 @@ Attachments:
 	<category name="wcf.search">
 		<item name="wcf.search.author"><![CDATA[Search by Author]]></item>
 		<item name="wcf.search.extended"><![CDATA[More Options]]></item>
-		<item name="wcf.search.matchExactly"><![CDATA[Exact match]]></item>
 		<item name="wcf.search.period"><![CDATA[Time Period]]></item>
 		<item name="wcf.search.sortBy"><![CDATA[Sort by]]></item>
 		<item name="wcf.search.sortBy.relevance"><![CDATA[Relevance]]></item>
@@ -5620,5 +5619,6 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phras
 	<item name="wcf.user.profile.customization" />
 	<item name="wcf.acp.option.enable_desktop_notifications"/>
 	<item name="wcf.acp.option.enable_desktop_notifications.description"/>
+	<item name="wcf.search.matchExactly" />
 </delete>
 </language>