Merge branch 'wip-MDL-27867-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE
This commit is contained in:
@@ -176,7 +176,9 @@ class course_edit_form extends moodleform {
|
||||
$themes=array();
|
||||
$themes[''] = get_string('forceno');
|
||||
foreach ($themeobjects as $key=>$theme) {
|
||||
$themes[$key] = $theme->name;
|
||||
if (empty($theme->hidefromselector)) {
|
||||
$themes[$key] = $theme->name;
|
||||
}
|
||||
}
|
||||
$mform->addElement('select', 'theme', get_string('forcetheme'), $themes);
|
||||
}
|
||||
|
||||
@@ -41,7 +41,9 @@ class editcategory_form extends moodleform {
|
||||
$themes = array(''=>get_string('forceno'));
|
||||
$allthemes = get_list_of_themes();
|
||||
foreach ($allthemes as $key=>$theme) {
|
||||
$themes[$key] = $theme->name;
|
||||
if (empty($theme->hidefromselector)) {
|
||||
$themes[$key] = $theme->name;
|
||||
}
|
||||
}
|
||||
$mform->addElement('select', 'theme', get_string('forcetheme'), $themes);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user