Commit 3fa0670a authored by Petr Skoda's avatar Petr Skoda
Browse files

Merge branch 'MDL-26109' of git://github.com/nebgor/moodle

parents 5d41c24d dde36f9d
......@@ -278,8 +278,8 @@ class block_base {
*/
protected function formatted_contents($output) {
$this->get_content();
$this->get_required_javascript();
if (!empty($this->content->text)) {
$this->get_required_javascript();
return $this->content->text;
} else {
return '';
......@@ -688,8 +688,8 @@ class block_list extends block_base {
protected function formatted_contents($output) {
$this->get_content();
$this->get_required_javascript();
if (!empty($this->content->items)) {
$this->get_required_javascript();
return $output->list_block_contents($this->content->icons, $this->content->items);
} else {
return '';
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment