mirror of
https://github.com/moodle/moodle.git
synced 2025-05-31 21:19:49 +02:00
Merge branch 'w17_MDL-39336_m25_install' of git://github.com/skodak/moodle
This commit is contained in:
commit
0c5d8ccb9a
@ -469,6 +469,12 @@ class core_renderer extends renderer_base {
|
||||
public function standard_footer_html() {
|
||||
global $CFG, $SCRIPT;
|
||||
|
||||
if (during_initial_install()) {
|
||||
// Debugging info can not work before install is finished,
|
||||
// in any case we do not want any links during installation!
|
||||
return '';
|
||||
}
|
||||
|
||||
// This function is normally called from a layout.php file in {@link core_renderer::header()}
|
||||
// but some of the content won't be known until later, so we return a placeholder
|
||||
// for now. This will be replaced with the real content in {@link core_renderer::footer()}.
|
||||
|
@ -703,6 +703,7 @@ try {
|
||||
if (empty($CFG->version)) {
|
||||
$SITE = new stdClass();
|
||||
$SITE->id = 1;
|
||||
$SITE->shortname = null;
|
||||
} else {
|
||||
throw $e;
|
||||
}
|
||||
|
@ -87,7 +87,7 @@ echo $OUTPUT->doctype() ?>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
</head>
|
||||
|
||||
<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join($bodyclasses)) ?>">
|
||||
<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
|
||||
|
||||
<?php echo $OUTPUT->standard_top_of_body_html() ?>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user