Merge branch 'MDL-51184-master' of git://github.com/marinaglancy/moodle

This commit is contained in:
David Monllao 2015-08-24 15:29:58 +08:00
commit 259bd67ce9

View File

@ -1660,11 +1660,11 @@ class theme_config {
global $CFG;
if ($this->usesvg === null) {
if (!isset($CFG->svgicons) || !is_bool($CFG->svgicons)) {
if (!isset($CFG->svgicons)) {
$this->usesvg = core_useragent::supports_svg();
} else {
// Force them on/off depending upon the setting.
$this->usesvg = $CFG->svgicons;
$this->usesvg = (bool)$CFG->svgicons;
}
}
return $this->usesvg;