X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=includes%2Flogging%2FLogPager.php;h=4ecc368d4e847f63b2039391d33336dcb317c4d4;hb=78c11f067909b6b7424f68ead29075619556a243;hp=0eeb544eb306bd1c6c7b548e7e077bfb5061c2fc;hpb=b1afc34fc8ace4dd5f54dca1ccec81d4fa7b8144;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/logging/LogPager.php b/includes/logging/LogPager.php
index 0eeb544eb3..4ecc368d4e 100644
--- a/includes/logging/LogPager.php
+++ b/includes/logging/LogPager.php
@@ -337,9 +337,9 @@ class LogPager extends ReverseChronologicalPager {
 
 		// T221458: MySQL/MariaDB (10.1.37) can sometimes irrationally decide that querying `actor` before
 		// `logging` and filesorting is somehow better than querying $limit+1 rows from `logging`.
-		// Tell it not to reorder the query. But not when tag filtering was used, as it seems as likely
-		// to be harmed as helped in that case.
-		if ( !$this->mTagFilter ) {
+		// Tell it not to reorder the query. But not when tag filtering or log_search was used, as it
+		// seems as likely to be harmed as helped in that case.
+		if ( !$this->mTagFilter && !array_key_exists( 'ls_field', $this->mConds ) ) {
 			$options[] = 'STRAIGHT_JOIN';
 		}