In order to make sent_subfolders work I had to change a lot of code.

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index c2433a26c614c17f460f4e1ed699d0096f8cb9c7..37a15656dc083e350c2006878a511fdd885dba9f 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -35,7 +35,7 @@ if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None')) {
 }
 
 if (isset($draft)) {
-    require_once ('../src/draft_actions.php');
+    include_once ('../src/draft_actions.php');
     if (!saveMessageAsDraft($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id)) {
         showInputForm();
         exit();
@@ -454,8 +454,8 @@ function showInputForm () {
         showComposeButtonRow();
     }
 
-    $idents = getPref($data_dir, $username, 'identities');
-    if ($idents != '' && $idents > 1) {
+    $idents = getPref($data_dir, $username, 'identities', 0);
+    if ($idents > 1) {
         echo '   <TR>' . "\n" .
              '      <TD BGCOLOR="' . $color[4] . '" WIDTH="10%" ALIGN=RIGHT>' .
              "\n" .