Merge branch 'MDL-42858_m26' of git://github.com/rwijaya/moodle into MOODLE_26_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Dan Poltawski 2013-11-25 10:49:02 +08:00
commit 9e2bc0490f
4 changed files with 1 additions and 18 deletions

View file

@ -622,10 +622,6 @@ class helper {
if (!$category->can_change_visibility()) {
throw new \moodle_exception('permissiondenied', 'error', '', null, 'coursecat::can_change_visbility');
}
if ((int)$category->get_parent_coursecat()->visible === 0) {
// You cannot mark a category visible if its parent is hidden.
return false;
}
$category->show();
return true;
}