moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

blocks MDL-19010 Slight reordering of logic to allow titles to be changed by block get_contents (credit to tim)

Browse source
This commit is contained in:
moodler 2009-07-31 04:17:09 +00:00
parent 2c78f462ed
commit e54f4a78cc
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
blocks/moodleblock.class.php
View file

@ -356,6 +356,15 @@ class block_base {
$bc->blockinstanceid = $this->instance->id; $bc->blockinstanceid = $this->instance->id;
$bc->blockpositionid = $this->instance->blockpositionid; $bc->blockpositionid = $this->instance->blockpositionid;
if ($this->instance->visible) {
$bc->content = $this->formatted_contents($output);
if (!empty($this->content->footer)) {
$bc->footer = $this->content->footer;
}
} else {
$bc->add_class('invisible');
}
$attributes = $this->html_attributes(); $attributes = $this->html_attributes();
if (isset($attributes['id'])) { if (isset($attributes['id'])) {
$bc->id = $attributes['id']; $bc->id = $attributes['id'];
@ -371,15 +380,6 @@ class block_base {
$bc->title = $this->title; $bc->title = $this->title;
} }
if ($this->instance->visible) {
$bc->content = $this->formatted_contents($output);
if (!empty($this->content->footer)) {
$bc->footer = $this->content->footer;
}
} else {
$bc->add_class('invisible');
}
if ($this->page->user_is_editing()) { if ($this->page->user_is_editing()) {
$bc->controls = $this->page->blocks->edit_controls($this); $bc->controls = $this->page->blocks->edit_controls($this);
} }