Fix an odd circular loop in redirect.

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index 33332825eba0159ba09281e2f1ac6b8051a0c579..fef9c415234caa710a3d87def48a1651e2977d1d 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -1176,16 +1176,12 @@ function saveAttachedFiles($session) {
         $full_localfilename = "$hashed_attachment_dir/$localfilename";
     }
 
+    // FIXME: we SHOULD prefer move_uploaded_file over rename because
+    // m_u_f works better with restricted PHP installes (safe_mode, open_basedir)
     if (!@rename($_FILES['attachfile']['tmp_name'], $full_localfilename)) {
-       if (function_exists("move_uploaded_file")) {
             if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$full_localfilename)) {
                return true;
            }
-       } else {
-           if (!@copy($_FILES['attachfile']['tmp_name'], $full_localfilename)) {
-                return true;
-            }
-       }
     }
     $message = $compose_messages[$session];
     $type = strtolower($_FILES['attachfile']['type']);