X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fimap_search.php;h=0d9fb3066c3b07bf173cbc6c7d7503ffc983a1a6;hb=65ffb3cef2a2421a586d184a2814ed58a47faa6a;hp=bffad029b37d42bbd0d2829563ba8acecb24def3;hpb=3e47c7aa9120fd5e66eda22477a633d40d0cc1ba;p=squirrelmail.git

diff --git a/functions/imap_search.php b/functions/imap_search.php
index bffad029..0d9fb306 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -21,7 +21,7 @@ function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
                        $color, $search_position = '', $search_all, $count_all) {
 
     global $msgs, $message_highlight_list, $squirrelmail_language, $languages,
-           $index_order, $pos;
+           $index_order, $pos, $allow_charset_search;
 
     $pos = $search_position;
 
@@ -41,7 +41,7 @@ function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
     $search_string = trim($search_string);
 
     /* now use $search_string in the imap search */
-    if (isset($languages[$squirrelmail_language]['CHARSET']) &&
+    if ($allow_charset_search && isset($languages[$squirrelmail_language]['CHARSET']) &&
         $languages[$squirrelmail_language]['CHARSET']) {
         $ss = "SEARCH CHARSET "
             . strtoupper($languages[$squirrelmail_language]['CHARSET'])