diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index 07378946e1c1b..8b278769087f7 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -469,6 +469,12 @@ public function maintenance_warning() { 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()}. diff --git a/lib/setup.php b/lib/setup.php index de8a7b1c040c6..a5db7803e934d 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -703,6 +703,7 @@ function stripslashes_deep($value) { if (empty($CFG->version)) { $SITE = new stdClass(); $SITE->id = 1; + $SITE->shortname = null; } else { throw $e; } diff --git a/theme/clean/layout/general.php b/theme/clean/layout/general.php index e69a5d0cb1566..4146cfa2e9456 100644 --- a/theme/clean/layout/general.php +++ b/theme/clean/layout/general.php @@ -87,7 +87,7 @@ - + standard_top_of_body_html() ?>