From af5765b3fbe82ea8e55d8ddcc3fe220ff845fef9 Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Tue, 15 Nov 2016 14:28:15 +0800 Subject: [PATCH] MDL-56139 core_message: removed unused constants --- lib/navigationlib.php | 6 ------ message/lib.php | 23 ++--------------------- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/lib/navigationlib.php b/lib/navigationlib.php index 588bb99aada..2f6c61006e4 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -2334,9 +2334,6 @@ class global_navigation extends navigation_node { if ($USER->id != $user->id) { $messageargs['user2'] = $user->id; } - if ($course->id != $SITE->id) { - $messageargs['viewing'] = MESSAGE_VIEW_COURSE. $course->id; - } $url = new moodle_url('/message/index.php', $messageargs); $usernode->add(get_string('messages', 'message'), $url, self::TYPE_SETTING, null, 'messages'); } @@ -4640,9 +4637,6 @@ class settings_navigation extends navigation_node { if ($USER->id != $user->id) { $messageargs['user2'] = $user->id; } - if ($course->id != $SITE->id) { - $messageargs['viewing'] = MESSAGE_VIEW_COURSE. $course->id; - } $url = new moodle_url('/message/index.php', $messageargs); $dashboard->add(get_string('messages', 'message'), $url, self::TYPE_SETTING, null, 'messages'); } diff --git a/message/lib.php b/message/lib.php index f3820c39cea..d79fdc70421 100644 --- a/message/lib.php +++ b/message/lib.php @@ -24,31 +24,12 @@ require_once($CFG->libdir.'/eventslib.php'); -define ('MESSAGE_SHORTLENGTH', 300); +define('MESSAGE_SHORTLENGTH', 300); -define ('MESSAGE_DISCUSSION_WIDTH',600); -define ('MESSAGE_DISCUSSION_HEIGHT',500); - -define ('MESSAGE_SHORTVIEW_LIMIT', 8);//the maximum number of messages to show on the short message history - -define('MESSAGE_HISTORY_SHORT',0); -define('MESSAGE_HISTORY_ALL',1); - -define('MESSAGE_VIEW_UNREAD_MESSAGES','unread'); -define('MESSAGE_VIEW_RECENT_CONVERSATIONS','recentconversations'); -define('MESSAGE_VIEW_RECENT_NOTIFICATIONS','recentnotifications'); -define('MESSAGE_VIEW_CONTACTS','contacts'); -define('MESSAGE_VIEW_BLOCKED','blockedusers'); -define('MESSAGE_VIEW_COURSE','course_'); -define('MESSAGE_VIEW_SEARCH','search'); +define('MESSAGE_HISTORY_ALL', 1); define('MESSAGE_SEARCH_MAX_RESULTS', 200); -define('MESSAGE_CONTACTS_PER_PAGE',10); -define('MESSAGE_MAX_COURSE_NAME_LENGTH', 30); - -define('MESSAGE_UNREAD', 'unread'); -define('MESSAGE_READ', 'read'); define('MESSAGE_TYPE_NOTIFICATION', 'notification'); define('MESSAGE_TYPE_MESSAGE', 'message');