The contents object may not be available here

horde · Mar 11, 2014 · c9a0608 · c9a0608
1 parent 8dd4225
commit c9a0608
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/imp/lib/Basic/Compose.php b/imp/lib/Basic/Compose.php
@@ -353,8 +353,18 @@ protected function _init()
 
         case 'replyall_revert':
         case 'replylist_revert':
-            $reply_msg = $imp_compose->replyMessage(IMP_Compose::REPLY_SENDER, $imp_compose->getContentsOb());
-            $header = $this->_convertToHeader($reply_msg);
+            if ($contents = $imp_compose->getContentsOb()) {
+                $reply_msg = $imp_compose->replyMessage(
+                    IMP_Compose::REPLY_SENDER,
+                    $contents
+                );
+                $header = $this->_convertToHeader($reply_msg);
+            } else {
+                $notification->push(
+                    _("Could not retrieve message data from the mail server."),
+                    'horde.error'
+                );
+            }
             break;
 
         case 'forward_attach':