Merge branch 'w17_MDL-39336_m25_install' of git://github.com/skodak/m…

…oodle
moodle · Apr 28, 2013 · 0c5d8cc · 0c5d8cc
2 parents 036b18a + 45951bb
commit 0c5d8cc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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
@@ -87,7 +87,7 @@
     <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() ?>