Move AND/OR charset conversion

We need to honor the $convert parameter.
horde · May 8, 2015 · 2c80c52 · 2c80c52
1 parent 6724968
commit 2c80c52
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Search/Query.php b/framework/Imap_Client/lib/Horde/Imap/Client/Search/Query.php
@@ -83,6 +83,10 @@ public function charset($charset, $convert = true)
         $oldcharset = $this->_charset;
         $this->_charset = Horde_String::upper($charset);
 
+        if (!$convert || ($oldcharset == $this->_charset)) {
+            return;
+        }
+
         foreach (array('and', 'or') as $item) {
             if (isset($this->_search[$item])) {
                 foreach ($this->_search[$item] as &$val) {
@@ -91,10 +95,6 @@ public function charset($charset, $convert = true)
             }
         }
 
-        if (!$convert || ($oldcharset == $this->_charset)) {
-            return;
-        }
-
         foreach (array('header', 'text') as $item) {
             if (isset($this->_search[$item])) {
                 foreach ($this->_search[$item] as $key => $val) {