Don't set the charset if it isn't used - prevent strange outlook mail…

… server errors #100
Webklex · Jul 22, 2018 · f22d863 · f22d863
1 parent 4fd65cf
commit f22d863
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/IMAP/Query/Query.php b/src/IMAP/Query/Query.php
@@ -119,7 +119,16 @@ public function get() {
 
         try {
             $this->generate_query();
-            $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), SE_UID, $this->getCharset());
+
+            /**
+             * Don't set the charset if it isn't used - prevent strange outlook mail server errors
+             * @see https://github.com/Webklex/laravel-imap/issues/100
+             */
+            if($this->getCharset() === null){
+                $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), SE_UID);
+            }else{
+                $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), SE_UID, $this->getCharset());
+            }
 
             if ($available_messages !== false) {