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

This commit is contained in:
Dan Poltawski 2013-10-09 16:27:50 +08:00
commit c58b3ca0ca
2 changed files with 29 additions and 0 deletions

View file

@ -249,6 +249,17 @@ class page_requirements_manager {
$this->YUI_config->debug = false;
}
// Include the YUI config log filters.
if (!empty($CFG->yuilogexclude) && is_array($CFG->yuilogexclude)) {
$this->YUI_config->logExclude = $CFG->yuilogexclude;
}
if (!empty($CFG->yuiloginclude) && is_array($CFG->yuiloginclude)) {
$this->YUI_config->logInclude = $CFG->yuiloginclude;
}
if (!empty($CFG->yuiloglevel)) {
$this->YUI_config->logLevel = $CFG->yuiloglevel;
}
// Add the moodle group's module data.
$this->YUI_config->add_moodle_metadata();