From 89949d61829b59f5a85151772d171b97140e2a6d Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 1 May 2015 12:30:31 +0530 Subject: [PATCH] bug #4883 Search function breaks when searching for certain combinations of backslashes and slashes Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/DbSearch.class.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 858dbf74c1..5381f0fb01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug #4880 Designer icons missing when using original theme - bug #4878 Column list of central columns is not cleared - bug #4881 jQuery dialogs of the Designer are not displayed in fullscreen +- bug #4883 Search function breaks when searching for certain combinations of backslashes and slashes 4.4.4.0 (2015-04-26) - bug #4863 Edit vs Change diff --git a/libraries/DbSearch.class.php b/libraries/DbSearch.class.php index 30e30d2a66..a6a1e831d0 100644 --- a/libraries/DbSearch.class.php +++ b/libraries/DbSearch.class.php @@ -205,14 +205,14 @@ class PMA_DbSearch // For "as regular expression" (search option 4), LIKE won't be used // Usage example: If user is searching for a literal $ in a regexp search, // he should enter \$ as the value. - $this->_criteriaSearchString = PMA_Util::sqlAddSlashes( + $criteriaSearchStringEscaped = PMA_Util::sqlAddSlashes( $this->_criteriaSearchString, ($this->_criteriaSearchType == 4 ? false : true) ); // Extract search words or pattern $search_words = (($this->_criteriaSearchType > 2) - ? array($this->_criteriaSearchString) - : explode(' ', $this->_criteriaSearchString)); + ? array($criteriaSearchStringEscaped) + : explode(' ', $criteriaSearchStringEscaped)); foreach ($search_words as $search_word) { // Eliminates empty values