Browse files

Merge branch 'MDL-25596-fixed' of git://github.com/samhemelryk/moodle

  • Loading branch information...
2 parents 90c42e0 + 0022a97 commit f4f374176d75c24eef65923d97ae7c4310869e0e @skodak skodak committed Jan 12, 2011
Showing with 5 additions and 1 deletion.
  1. +5 −1 blocks/navigation/block_navigation.php
View
6 blocks/navigation/block_navigation.php
@@ -107,12 +107,16 @@ function get_required_javascript() {
if (!empty($CFG->navcourselimit)) {
$limit = $CFG->navcourselimit;
}
+ $expansionlimit = 0;
+ if (!empty($this->config->expansionlimit)) {
+ $expansionlimit = $this->config->expansionlimit;
+ }
$arguments = array(
'id' => $this->instance->id,
'instance' => $this->instance->id,
'candock' => $this->instance_can_be_docked(),
'courselimit' => $limit,
- 'expansionlimit' => $this->config->expansionlimit
+ 'expansionlimit' => $expansionlimit
);
$this->page->requires->yui_module(array('core_dock', 'moodle-block_navigation-navigation'), 'M.block_navigation.init_add_tree', array($arguments));
}

0 comments on commit f4f3741

Please sign in to comment.