From f61feb56fd19b8ac9e97bf1c04ebcd571d5ca244 Mon Sep 17 00:00:00 2001
From: Ryan Cramer <ryan@processwire.com>
Date: Mon, 4 Oct 2021 10:56:12 -0400
Subject: [PATCH] Fix issue processwire/processwire-issues#1439

---
 .../ProcessPageSearch/ProcessPageSearch.module      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/wire/modules/Process/ProcessPageSearch/ProcessPageSearch.module b/wire/modules/Process/ProcessPageSearch/ProcessPageSearch.module
index 2211852a..1f4941f1 100644
--- a/wire/modules/Process/ProcessPageSearch/ProcessPageSearch.module
+++ b/wire/modules/Process/ProcessPageSearch/ProcessPageSearch.module
@@ -337,12 +337,13 @@ class ProcessPageSearch extends Process implements ConfigurableModule {
 				
 			} else {
 
-				$operator = substr($name, -1) . '=';
-
-				if(isset($this->operators[$operator])) {
-					$name = substr($name, 0, -1); 
-				} else {
-					$operator = '=';
+				$operator = '=';
+				$operatorChars = preg_quote(implode('', Selectors::getOperatorChars()));
+				if(preg_match('/^(.+?)([' . $operatorChars . ']+)$/', $name, $matches)) {
+					$name = $matches[1];
+					$operator = $matches[2] . '=';
+					// if unsupported operator requested, substitute '='
+					if(!isset($this->operators[$operator])) $operator = '=';
 				}
 			}