Merge branch 'MDL-56623_30-messages-to-adressed-to-until' of git://gi…

…thub.com/lucaboesch/moodle into MOODLE_30_STABLE
moodle · Nov 10, 2016 · 0d593bd · 0d593bd
2 parents 0dd5c40 + 6006cd7
commit 0d593bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
@@ -70,6 +70,7 @@
 $string['addresourceoractivity'] = 'Add an activity or resource';
 $string['addresourcetosection'] = 'Add a resource to section \'{$a}\'';
 $string['address'] = 'Address';
+$string['addressedto'] = 'To';
 $string['addstudent'] = 'Add student';
 $string['addsubcategory'] = 'Add a subcategory';
 $string['addteacher'] = 'Add teacher';

diff --git a/message/lib.php b/message/lib.php
@@ -1407,7 +1407,7 @@ function message_print_search_results($frm, $showicontext=false, $currentuser=nu
             $headertdend   = html_writer::end_tag('td');
             echo html_writer::start_tag('tr');
             echo $headertdstart.get_string('from').$headertdend;
-            echo $headertdstart.get_string('to').$headertdend;
+            echo $headertdstart.get_string('addressedto').$headertdend;
             echo $headertdstart.get_string('message', 'message').$headertdend;
             echo $headertdstart.get_string('timesent', 'message').$headertdend;
             echo html_writer::end_tag('tr');