Fixed #230: fixed AbstractMessagePart::partForUniqueID() and case when all required data have not been retrieved yet htmlForAbstractMessagePart()

2 files changed, 3 insertions, 2 deletions

diff --git a/src/core/abstract/MCAbstractMessagePart.cc b/src/core/abstract/MCAbstractMessagePart.cc
index b4ec4c9a..be6e8e9b 100644
--- a/src/core/abstract/MCAbstractMessagePart.cc
+++ b/src/core/abstract/MCAbstractMessagePart.cc
@@ -75,5 +75,5 @@ AbstractPart * AbstractMessagePart::partForContentID(String * contentID)
 
 AbstractPart * AbstractMessagePart::partForUniqueID(String * contentID)
 {
-    return mainPart()->partForContentID(contentID);
+    return mainPart()->partForUniqueID(contentID);
 }
diff --git a/src/core/renderer/MCHTMLRenderer.cc b/src/core/renderer/MCHTMLRenderer.cc
index 5cffa106..071d7523 100644
--- a/src/core/renderer/MCHTMLRenderer.cc
+++ b/src/core/renderer/MCHTMLRenderer.cc
@@ -357,7 +357,8 @@ static String * htmlForAbstractMessagePart(AbstractMessagePart * part, htmlRende
         return NULL;
     }
     String * substring = htmlForAbstractPart(part->mainPart(), context);
-    MCAssert(substring != NULL);
+    if (substring == NULL)
+        return NULL;
     
     HashMap * values = context->htmlCallback->templateValuesForHeader(part->header());
     String * headerString = renderTemplate(context->htmlCallback->templateForEmbeddedMessageHeader(part->header()), values);