"Jason Munro" <jason@stdbev.com>
authorphilippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Sat, 26 Jan 2002 06:09:46 +0000 (06:09 +0000)
committerphilippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Sat, 26 Jan 2002 06:09:46 +0000 (06:09 +0000)
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

functions/imap_search.php

index 5661895..6660d38 100644 (file)
@@ -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);
     }