From 2135a251834eb38cefdd2da1980f46bca41358c4 Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Mon, 6 Mar 2017 12:48:29 +0000
Subject: [PATCH] Issue #2823963 by vaplas, Andrej Galuf, dawehner: Views
StringFilter using 'Contains any word' or 'Contains all words' breaks query
on strings containing only characters that will be trimmed
---
.../src/Plugin/views/filter/StringFilter.php | 2 +-
.../src/Kernel/Handler/FilterStringTest.php | 36 +++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/core/modules/views/src/Plugin/views/filter/StringFilter.php b/core/modules/views/src/Plugin/views/filter/StringFilter.php
index 733db53ac702..a9ab5a1861bb 100644
--- a/core/modules/views/src/Plugin/views/filter/StringFilter.php
+++ b/core/modules/views/src/Plugin/views/filter/StringFilter.php
@@ -288,7 +288,7 @@ protected function opContainsWord($field) {
}
}
- if (!$where) {
+ if ($where->count() === 0) {
return;
}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php
index 9ad0f88f6330..c24cc6ff0348 100644
--- a/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php
@@ -293,6 +293,42 @@ public function testFilterStringWord() {
],
];
$this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+ $view->destroy();
+
+ $view = Views::getView('test_view');
+ $view->setDisplay();
+
+ // Change the filtering to a sting containing only illegal characters.
+ $view->displayHandlers->get('default')->overrideOption('filters', [
+ 'description' => [
+ 'id' => 'description',
+ 'table' => 'views_test_data',
+ 'field' => 'description',
+ 'relationship' => 'none',
+ 'operator' => 'allwords',
+ 'value' => ':-)',
+ ],
+ ]);
+
+ $this->executeView($view);
+ $resultset = [
+ [
+ 'name' => 'Ringo',
+ ],
+ [
+ 'name' => 'John',
+ ],
+ [
+ 'name' => 'George',
+ ],
+ [
+ 'name' => 'Paul',
+ ],
+ [
+ 'name' => 'Meredith',
+ ],
+ ];
+ $this->assertIdenticalResultset($view, $resultset);
}
--
GitLab