From d7f9acc46a0b92906879d741b633ffd30efe1e67 Mon Sep 17 00:00:00 2001
From: Dave Cooper <dave@moodle.com>
Date: Fri, 24 Oct 2014 10:54:45 +0800
Subject: [PATCH] MDL-47833 core: Change default expiry for message inbound
 handlers

---
 admin/tool/messageinbound/classes/edit_handler_form.php | 2 +-
 lib/classes/message/inbound/handler.php                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/tool/messageinbound/classes/edit_handler_form.php b/admin/tool/messageinbound/classes/edit_handler_form.php
index bcb6af599ca..a3c36ac2702 100644
--- a/admin/tool/messageinbound/classes/edit_handler_form.php
+++ b/admin/tool/messageinbound/classes/edit_handler_form.php
@@ -67,7 +67,7 @@ class tool_messageinbound_edit_handler_form extends moodleform {
             DAYSECS => get_string('oneday', 'tool_messageinbound'),
             WEEKSECS => get_string('oneweek', 'tool_messageinbound'),
             YEARSECS => get_string('oneyear', 'tool_messageinbound'),
-            '' => get_string('noexpiry', 'tool_messageinbound'),
+            0 => get_string('noexpiry', 'tool_messageinbound'),
         );
         $mform->addElement('select', 'defaultexpiration', get_string('defaultexpiration', 'tool_messageinbound'), $options);
         $mform->addHelpButton('defaultexpiration', 'defaultexpiration', 'tool_messageinbound');
diff --git a/lib/classes/message/inbound/handler.php b/lib/classes/message/inbound/handler.php
index ab92ee1c624..d1d4d9469e5 100644
--- a/lib/classes/message/inbound/handler.php
+++ b/lib/classes/message/inbound/handler.php
@@ -53,7 +53,7 @@ abstract class handler {
     /**
      * @var int $defaultexpiration The default expiration time to use when created a new key.
      */
-    private $defaultexpiration = 86400;
+    private $defaultexpiration = WEEKSECS;
 
     /**
      * @var bool $validateaddress Whether to validate the sender address when processing this handler.