Permalink
Browse files

Merge branch 'MDL-46344-34' of https://github.com/lucaboesch/moodle i…

…nto MOODLE_34_STABLE
  • Loading branch information...
dmonllao authored and stronk7 committed Jun 5, 2018
2 parents cf5ed61 + c5999e9 commit 2e0fa15542b08cb3fd4916c5a76c48110f503849
Showing with 3 additions and 1 deletion.
  1. +1 −0 lang/en/admin.php
  2. +2 −1 lib/outputrenderers.php
@@ -820,6 +820,7 @@
$string['order4'] = 'Fourth';
$string['outgoingmailconfig'] = 'Outgoing mail configuration';
$string['overridetossl'] = 'HTTPS for logins has now been deprecated. This instance is now forced to SSL. To remedy this warning change your wwwroot in config.php to https://';
$string['pageinfodebugsummary'] = 'This page is: {$a}';
$string['passwordchangelogout'] = 'Log out after password change';
$string['passwordchangelogout_desc'] = 'If enabled, when a password is changed, all browser sessions are terminated, apart from the one in which the new password is specified. (This setting does not affect password changes via bulk user upload.)';
$string['passwordchangetokendeletion'] = 'Remove web service access tokens after password change';
@@ -770,7 +770,8 @@ public function standard_footer_html() {
$output .= $this->theme_switch_links();
if (!empty($CFG->debugpageinfo)) {
$output .= '<div class="performanceinfo pageinfo">This page is: ' . $this->page->debug_summary() . '</div>';
$output .= '<div class="performanceinfo pageinfo">' . get_string('pageinfodebugsummary', 'core_admin',
$this->page->debug_summary()) . '</div>';
}
if (debugging(null, DEBUG_DEVELOPER) and has_capability('moodle/site:config', context_system::instance())) { // Only in developer mode
// Add link to profiling report if necessary

0 comments on commit 2e0fa15

Please sign in to comment.