No longer requires both body and subject. One of them is enough.

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

diff --git a/src/compose.php b/src/compose.php
index f3324d620092fd0d919a5fcede5ae83d32d3f65b..daae7b63b2f32fbffbe94e44f4a945513886d706 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -258,18 +258,14 @@
           error message, show=true **/
       global $body, $send_to, $subject, $color;
 
-      if ($body == "") {
+      if ($body == "" && $subject == "") {
          if ($show)
-            plain_error_message(_("You have not entered a message body."), $color);
+            plain_error_message(_("You have not entered a message body or a subject."), $color);
          return false;
       } else if ($send_to == "") {
          if ($show)
             plain_error_message(_("You have not filled in the \"To:\" field."), $color);
          return false;
-      } else if ($subject == "") {
-         if ($show)
-            plain_error_message(_("You have not entered a subject."), $color);
-         return false;
       }
       return true;
    } // function checkInput()