From 6c0f13a5bcb94de5d921a64c25e1c8c7b43aef79 Mon Sep 17 00:00:00 2001
From: "Andrew Davis (andyjdavis)" <andrew@moodle.com>
Date: Tue, 22 Feb 2011 16:05:01 +0800
Subject: [PATCH] message MDL-25816 added safety checks in form processing

---
 message/output/email/message_output_email.php   | 4 +++-
 message/output/jabber/message_output_jabber.php | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/message/output/email/message_output_email.php b/message/output/email/message_output_email.php
index 90bf792396d..dff487450e0 100644
--- 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 a6f9f65d5da..945d790f895 100644
--- 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;
+        }
     }
 
     /**