* Removed the other workarounds too. :-)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1068 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/smtp.php b/functions/smtp.php
index 7fe5e285085c64573cc5d93e82e946c9c346ac85..c4f4dac5d136fa33eb57db6b824c3a45cb7aae4a 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -491,9 +491,7 @@
 
       $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 1);
 
-      // The trim() is a workaround for RedHat's PHP 4.0.4pl1-3
-      // Possibly is there to make Konq work.
-      if ($reply_id = trim($reply_id)) {
+      if (isset($reply_id) && $reply_id) {
          sqimap_mailbox_select ($imap_stream, $mailbox);
          sqimap_messages_flag ($imap_stream, $reply_id, $reply_id, 'Answered');
 
@@ -525,9 +523,6 @@
          $length = sendSMTP($t, $c, $b, $subject, $body, $more_headers);
       }
 
-      // The trim() is a workaround for RedHat's PHP 4.0.4pl1-3
-      // Possibly is there to make Konq work.
-      $sent_folder = trim($sent_folder);
       if (sqimap_mailbox_exists ($imap_stream, $sent_folder)) {
          sqimap_append ($imap_stream, $sent_folder, $length);
          write822Header ($imap_stream, $t, $c, $b, $subject, $more_headers);