Merge branch 'MDL-35230-master' of git://github.com/andrewnicols/moodle

This commit is contained in:
Dan Poltawski
2013-01-07 13:41:16 +08:00
2 changed files with 15 additions and 5 deletions
+6 -4
View File
@@ -393,10 +393,12 @@ class core_renderer extends renderer_base {
}
// Get the theme javascript head and footer
$jsurl = $this->page->theme->javascript_url(true);
$this->page->requires->js($jsurl, true);
$jsurl = $this->page->theme->javascript_url(false);
$this->page->requires->js($jsurl);
if ($jsurl = $this->page->theme->javascript_url(true)) {
$this->page->requires->js($jsurl, true);
}
if ($jsurl = $this->page->theme->javascript_url(false)) {
$this->page->requires->js($jsurl);
}
// Get any HTML from the page_requirements_manager.
$output .= $this->page->requires->get_head_code($this->page, $this);