Permalink
Browse files

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

  • Loading branch information...
2 parents 5d41c24 + dde36f9 commit 3fa0670a98120df81aefa1fcb1d18e62765876d3 @skodak skodak committed Feb 14, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 blocks/moodleblock.class.php
@@ -278,8 +278,8 @@ public function get_content_for_output($output) {
*/
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 @@ function is_empty() {
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 '';

0 comments on commit 3fa0670

Please sign in to comment.