From 54bf5de8d20c6689f09501acad0066d0e82b7cb7 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Tue, 14 Mar 2006 04:12:52 +0000
Subject: [PATCH] Merged fix for bug 4639 from stable

---
 message/lib.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/message/lib.php b/message/lib.php
index e93cc09061..1fc08d9c48 100644
--- a/message/lib.php
+++ b/message/lib.php
@@ -987,7 +987,10 @@ function message_post_message($userfrom, $userto, $message, $format, $messagetyp
 
     $preference = (object)get_user_preferences(NULL, NULL, $userto->id);
 
-    if (!empty($preference->message_emailmessages)) {  // Receiver wants mail forwarding
+    if (!isset($preference->message_emailmessages) or $preference->message_emailmessages) {  // Receiver wants mail forwarding
+        if (!isset($preference->message_emailtimenosee)) {
+            $preference->message_emailtimenosee = 10;
+        }
         if ((time() - $userto->lastaccess) > ((int)$preference->message_emailtimenosee * 60)) { // Long enough
 
             $message = stripslashes_safe($message);
@@ -1005,7 +1008,9 @@ function message_post_message($userfrom, $userto, $message, $format, $messagetyp
                 $messagehtml = NULL;
             }
 
-            $userto->email = $preference->message_emailaddress;   // Use custom messaging address
+            if (!empty($preference->message_emailaddress)) {
+                $userto->email = $preference->message_emailaddress;   // Use custom messaging address
+            }
             email_to_user($userto, $userfrom, $messagesubject, $messagetext, $messagehtml);
         }
     }
-- 
2.39.5