Merge branch 'MDL-41985-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 08:27:50 +0000 (16:27 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 08:27:50 +0000 (16:27 +0800)
1  2 
lib/outputrequirementslib.php

@@@ -219,11 -219,11 +219,11 @@@ class page_requirements_manager 
          $configname = $this->YUI_config->set_config_source('lib/yui/config/moodle.js');
          $this->YUI_config->add_group('moodle', array(
              'name' => 'moodle',
 -            'base' => $CFG->httpswwwroot . '/theme/yui_combo.php'.$sep.'moodle/'.$jsrev.'/',
 +            'base' => $CFG->httpswwwroot . '/theme/yui_combo.php' . $sep . 'm/' . $jsrev . '/',
              'combine' => $this->yui3loader->combine,
              'comboBase' => $CFG->httpswwwroot . '/theme/yui_combo.php'.$sep,
              'ext' => false,
 -            'root' => 'moodle/'.$jsrev.'/', // Add the rev to the root path so that we can control caching.
 +            'root' => 'm/'.$jsrev.'/', // Add the rev to the root path so that we can control caching.
              'patterns' => array(
                  'moodle-' => array(
                      'group' => 'moodle',
              $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();