Merge "Bug 1694874: Changing html escaping"

htdocs/lib/web.php

@@ -931,7 +931,7 @@ EOF;
         $smarty->assign('USERMASQUERADING', true);
         $smarty->assign('masqueradedetails', get_string('youaremasqueradingas', 'mahara', display_name($USER)));
         $smarty->assign('becomeyoulink', hsc($wwwroot) . 'admin/users/changeuser.php?restore=1');
-        $smarty->assign('becomeyouagain', get_string('becomeadminagain', 'admin', hsc($USER->get('parentuser')->name)));
+        $smarty->assign('becomeyouagain', get_string('becomeadminagain', 'admin', $USER->get('parentuser')->name));
     }
 
     // Define additional html content

htdocs/theme/raw/plugintype/blocktype/groupmembers/templates/row.tpl

@@ -3,8 +3,8 @@
         {foreach from=$groupmembers item=groupmember}
             <a href="{profile_url($groupmember)}" class="item user-icon metadata user-icon-larger">
                 <img src="{profile_icon_url user=$groupmember maxwidth=100 maxheight=100}" alt="{str tag=profileimagetext arg1=$groupmember|display_default_name}" title="{$groupmember|display_default_name|escape}">
-                 <p class="member-name">{$groupmember|display_default_name|escape}</p>
+                 <p class="member-name">{$groupmember|display_default_name}</p>
             </a>
         {/foreach}
     </div>
-</div>
\ No newline at end of file
+</div>