"Jason Munro" <jason@stdbev.com>

I missed a spot on the "multiple search terms" change.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2244 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/imap_search.php b/functions/imap_search.php
index 566189555096340ef8f702b23f9db6c1465c3f2c..6660d38ea39cb81027d8a8aaa6898e7dbbe2babf 100644 (file)
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -57,7 +57,8 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
     /* Read Data Back From IMAP */
     $readin = sqimap_run_command ($imapConnection, $ss, true, $result, $message);
     if (isset($languages[$squirrelmail_language]['CHARSET']) && strtolower($result) == 'no') {
     /* Read Data Back From IMAP */
     $readin = sqimap_run_command ($imapConnection, $ss, true, $result, $message);
     if (isset($languages[$squirrelmail_language]['CHARSET']) && strtolower($result) == 'no') {

-        $ss = "SEARCH CHARSET \"US-ASCII\" ALL $search_where \"$search_what\"";
+        // $ss = "SEARCH CHARSET \"US-ASCII\" ALL $search_where \"$search_what\"";
+        $ss = "SEARCH CHARSET \"US-ASCII\" ALL $search_string";

         $readin = sqimap_run_command ($imapConnection, $ss, true, $result, $message);
     }
 
         $readin = sqimap_run_command ($imapConnection, $ss, true, $result, $message);
     }