message MDL-25816 added safety checks in form processing

diff --git a/message/output/email/message_output_email.php b/message/output/email/message_output_email.php
index 90bf792..dff4874 100644 (file)
--- a/message/output/email/message_output_email.php
+++ b/message/output/email/message_output_email.php
@@ -85,7 +85,9 @@ class message_output_email extends message_output {
      * @param array $preferences preferences array
      */
     function process_form($form, &$preferences){
-        $preferences['message_processor_email_email'] = $form->email_email;
+        if (isset($form->email_email)) {
+            $preferences['message_processor_email_email'] = $form->email_email;
+        }
     }
 
     /**

diff --git a/message/output/jabber/message_output_jabber.php b/message/output/jabber/message_output_jabber.php
index a6f9f65..945d790 100644 (file)
--- a/message/output/jabber/message_output_jabber.php
+++ b/message/output/jabber/message_output_jabber.php
@@ -106,7 +106,9 @@ class message_output_jabber extends message_output {
      * @param array $preferences preferences array
      */
     function process_form($form, &$preferences){
-        $preferences['message_processor_jabber_jabberid'] = $form->jabber_jabberid;
+        if (isset($form->jabber_jabberid)) {
+            $preferences['message_processor_jabber_jabberid'] = $form->jabber_jabberid;
+        }
     }
 
     /**