Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4

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

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