Merge branch 'MDL-32026-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 Mar 2012 22:13:54 +0000 (11:13 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 Mar 2012 22:13:54 +0000 (11:13 +1300)
lib/messagelib.php

index 9619b96..b86ac10 100644 (file)
@@ -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');
         }