L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Petr Skoda
2011-02-14 22:10:37 +01:00
parent 5d41c24d9f dde36f9d65
commit 3fa0670a98
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/moodleblock.class.php
+2 -2
View File
@@ -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 '';