Merge branch 'MDL-42111' of git://github.com/rwijaya/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css

diff --git a/admin/auth_config.php b/admin/auth_config.php
index 50bcfc9..ed5fb41 100644 (file)
--- a/admin/auth_config.php
+++ b/admin/auth_config.php
@@ -78,6 +78,9 @@ echo '<p style="text-align: center"><input type="submit" value="' . get_string("
 echo "</div>\n";
 echo "</form>\n";
 
+$PAGE->requires->string_for_js('unmaskpassword', 'core_form');
+$PAGE->requires->yui_module('moodle-auth-passwordunmask', 'M.auth.passwordunmask');
+
 echo $OUTPUT->footer();
 exit;
 

diff --git a/admin/roles/assign.php b/admin/roles/assign.php
index 980e2ae..421eca2 100644 (file)
--- a/admin/roles/assign.php
+++ b/admin/roles/assign.php
@@ -149,12 +149,11 @@ switch ($context->contextlevel) {
         $showroles = 1;
         break;
     case CONTEXT_COURSECAT:
-        $PAGE->set_heading("$SITE->fullname: ".get_string("categories"));
+        $PAGE->set_heading($SITE->fullname);
         break;
     case CONTEXT_COURSE:
         if ($isfrontpage) {
-