A bit clearer null representation

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
index 62ec5b8..23270f9 100644 (file)
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
@@ -1207,7 +1207,7 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base
              * using literal8 "~{#} format", but it doesn't seem to work in
              * all servers tried (UW-IMAP/Cyrus). However, there is no other
              * way to append null data, so try anyway. */
-            $binary = (strpos($text, null) !== false);
+            $binary = (strpos($text, "\0") !== false);
 
             /* Need to add 2 additional characters (we send CRLF at the end of
              * a line) to literal count for multiappend messages to ensure the

diff --git a/framework/Mime/lib/Horde/Mime/Part.php b/framework/Mime/lib/Horde/Mime/Part.php
index 1be68bb..d659922 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Part.php
+++ b/framework/Mime/lib/Horde/Mime/Part.php
@@ -1560,7 +1560,7 @@ class Horde_Mime_Part
                 break;
 
             case 'binary':
-                if (strpos($line, null) !== false) {
+                if (strpos($line, "\0") !== false) {
                     return true;
                 }
                 break;