fix for getEntity and the return of a non-object

[squirrelmail.git] / class / mime.class.php

diff --git a/class/mime.class.php b/class/mime.class.php
index 66767315422e24c7696f130e9590dce3469a8f8d..8d1def3d81cb4a7afa55a7ceda5150600840f5bc 100644 (file)
--- a/class/mime.class.php
+++ b/class/mime.class.php
@@ -717,10 +717,13 @@ class message
           $msg = $msg->entities[0];
        }
 
-       if (isset($msg->entities[($ent_a[$cnt-1])-1]))
+        if (isset($msg->entities[($ent_a[$cnt-1])-1]))
        {
-           $msg = $msg->entities[($ent_a[$cnt-1]-1)];
-        }
+           if (is_object($msg->entities[($ent_a[$cnt-1])-1]))
+           {
+               $msg = $msg->entities[($ent_a[$cnt-1]-1)];
+           }
+       }
 
         return $msg;
     }