Commit f4f37417 authored by Petr Skoda's avatar Petr Skoda
Browse files

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

parents 90c42e0f 0022a97f
......@@ -107,12 +107,16 @@ class block_navigation extends block_base {
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));
}
......
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