Merged MDL-10771 from 18 stable

diff --git a/mod/chat/view.php b/mod/chat/view.php
index 2a3d854cab9e7a408e139e904a14ce46e6aefaeb..99d4d26b5ca646a8fff95c645be05bba0c07574b 100644 (file)
--- a/mod/chat/view.php
+++ b/mod/chat/view.php
@@ -117,14 +117,18 @@
             $chattarget = "/mod/chat/gui_$CFG->chat_method/index.php?id=$chat->id$groupparam"; 
         }
         
+        echo '<p>';
         link_to_popup_window ($chattarget,
-                              "chat$course->id$chat->id$groupparam", "<p>$strenterchat</p>", 500, 700, get_string('modulename', 'chat'));
+                              "chat$course->id$chat->id$groupparam", "$strenterchat", 500, 700, get_string('modulename', 'chat'));
+        echo '</p>';
         
         // if user is using screen reader, then there is no need to display this link again
         if ($CFG->chat_method == 'header_js' && empty($USER->screenreader)) {
             // show frame/js-less alternative
+            echo '<p>(';
             link_to_popup_window ("/mod/chat/gui_basic/index.php?id=$chat->id$groupparam",
-                                  "chat$course->id$chat->id$groupparam", '<p>('.get_string('noframesjs', 'message').')</p>', 500, 700, get_string('modulename', 'chat'));
+                                  "chat$course->id$chat->id$groupparam", get_string('noframesjs', 'message'), 500, 700, get_string('modulename', 'chat'));
+            echo ')</p>';
         }
 
         print_box_end();