Merge branch 'WIP-MDL-39871_master' of git://github.com/nadavkav/moodle

This commit is contained in:
Sam Hemelryk 2013-09-24 10:02:58 +12:00
commit 0fd451b7ad
5 changed files with 38 additions and 48 deletions

View file

@ -487,6 +487,11 @@ class theme_config {
}
}
// Use parent theme's "blockrtlmanipulations" if it was defined and if it was not defined on current theme.
if (empty($this->blockrtlmanipulations) and !empty($parent_config->blockrtlmanipulations)) {
$this->blockrtlmanipulations = $parent_config->blockrtlmanipulations;
}
//fix arrows if needed
$this->check_theme_arrows();
}