Merge branch 'wip-MDL-27867-m21' of git://github.com/samhemelryk/mood…

…le into MOODLE_21_STABLE
moodle · Oct 3, 2011 · 30ed26a · 30ed26a
2 parents 1e6c738 + 214784a
commit 30ed26a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/course/edit_form.php b/course/edit_form.php
@@ -176,7 +176,9 @@ function definition() {
             $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);
         }

diff --git a/course/editcategory_form.php b/course/editcategory_form.php
@@ -41,7 +41,9 @@ function definition() {
             $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);
         }