X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmime.php;h=d2e88463ce6da95afb4fcdd2fa908fca19838fd4;hp=4450529900b7abad21143a938f0db1a29a92931c;hb=a171b3591163cb893aa084582fa2a1fc76676dcd;hpb=1e4a4feba1aac2a0e78dfc8c880235fa196695ca

diff --git a/functions/mime.php b/functions/mime.php
index 44505299..d2e88463 100644
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -622,17 +622,15 @@ function encodeHeader ($string) {
 }
 
 /* This function trys to locate the entity_id of a specific mime element */
-
 function find_ent_id($id, $message) {
-    $ret = '';
-    for ($i = 0; $ret == '' && $i < count($message->entities); $i++) {
-        if ($message->entities[$i]->header->type0 != 'multipart')  {
+    for ($i = 0, $ret = ''; $ret == '' && $i < count($message->entities); $i++) {
+        if ($message->entities[$i]->header->type0 == 'multipart')  {
             $ret = find_ent_id($id, $message->entities[$i]);
         } else {
             if (strcasecmp($message->entities[$i]->header->id, $id) == 0) {
                 if (sq_check_save_extension($message->entities[$i])) {
-                    $ret = $message->entities[$i]->entity_id;
-                }
+                    return $message->entities[$i]->entity_id;
+                } 
             }
         }
     }