mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

MDL-19696 make sure install works.

Browse Source
This commit is contained in:
tjhunt 2009-07-03 09:03:50 +00:00
parent ae96b517a2
commit 94398fb3e8
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lang/en_utf8/moodle.php
View File

@ -1192,6 +1192,7 @@ $string['outline'] = 'Outline';
$string['outlinereport'] = 'Outline report';
$string['page'] = 'Page';
$string['pageheaderconfigablock'] = 'Configuring a block in %%fullname%%';
$string['pageshouldredirect'] = 'This page should automatically redirect. If nothing is happening please use the continue link below.';
$string['parentcategory'] = 'Parent category';
$string['parentcoursenotfound'] = 'Parent course not found!';
$string['parentcoursenotmetacourse'] = 'Parent course not metacourse!';

33
lib/pagelib.php
View File

@ -855,19 +855,11 @@ class moodle_page {
protected function starting_output() {
global $SITE, $CFG;
if (during_initial_install()) {
$this->_course = new stdClass;
$this->_course->id = 1;
moodle_setlocale();
return;
}
if (!$this->_course) {
$this->set_course($SITE);
}
$this->initialise_standard_body_classes();
$this->blocks->load_blocks();
if (!during_initial_install()) {
$this->blocks->load_blocks();
}
// Add any stylesheets required using the horrible legacy mechanism.
if (!empty($CFG->stylesheets)) {
@ -896,7 +888,7 @@ class moodle_page {
public function initialise_theme_and_output() {
global $OUTPUT, $PAGE, $SITE, $THEME;
if (!$this->_course) {
if (!$this->_course && !during_initial_install()) {
$this->set_course($SITE);
}
@ -1039,27 +1031,22 @@ class moodle_page {
}
$this->add_body_class($this->_legacyclass);
$this->add_body_class('course-' . $this->_course->id);
$this->add_body_classes(get_browser_version_classes());
$this->add_body_class('dir-' . get_string('thisdirection'));
$this->add_body_class('lang-' . current_language());
$this->add_body_class('yui-skin-sam'); // Make YUI happy, if it is used.
$this->add_body_class($this->url_to_class_name($CFG->wwwroot));
$this->add_body_class('context-' . $this->context->id);
if (!during_initial_install()) {
$this->add_body_class('course-' . $this->_course->id);
$this->add_body_class('context-' . $this->context->id);
}
if (!empty($this->_cm)) {
$this->add_body_class('cmid-' . $this->_cm->id);
}
$this->add_body_class('context-' . $this->context->id);
if (!empty($this->_cm)) {
$this->add_body_class('cmid-' . $this->_cm->id);
}
if ($CFG->allowcategorythemes) {
if (!empty($CFG->allowcategorythemes)) {
$this->ensure_category_loaded();
foreach ($this->_categories as $catid => $notused) {
$this->add_body_class('category-' . $catid);