From: Sam Hemelryk <sam@moodle.com>
Date: Sun, 25 Mar 2012 22:13:54 +0000 (+1300)
Subject: Merge branch 'MDL-32026-master-2' of git://git.luns.net.uk/moodle
X-Git-Tag: v2.3.0-beta~897
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=991b3a3a9bd93c36dbdf131b436e506535b6d4cd;hp=ef288bd4d382737f2629541082dc677518cfe9b3

Merge branch 'MDL-32026-master-2' of git://git.luns.net.uk/moodle
---

diff --git a/lib/messagelib.php b/lib/messagelib.php
index 9619b96d88f..b86ac100095 100644
--- a/lib/messagelib.php
+++ b/lib/messagelib.php
@@ -128,7 +128,7 @@ function message_send($eventdata) {
         } else {
             //MDL-25114 They supplied an $eventdata->component $eventdata->name combination which doesn't
             //exist in the message_provider table (thus there is no default settings for them)
-            $preferrormsg = get_string('couldnotfindpreference', 'message', $preferencename); //TODO: undefined $preferencename
+            $preferrormsg = get_string('couldnotfindpreference', 'message', $defaultpreference);
             throw new coding_exception($preferrormsg,'blah');
         }