MDL-17589 fixed handling of missing caps in admin tree; merged from MOODLE_19_STABLE

This commit is contained in:
skodak
2008-12-12 10:50:25 +00:00
parent 83f0fef567
commit 1a5b427e44
2 changed files with 14 additions and 4 deletions
+2 -2
View File
@@ -2196,7 +2196,7 @@ class admin_externalpage extends part_of_admin_tree {
}
$context = empty($this->context) ? get_context_instance(CONTEXT_SYSTEM) : $this->context;
foreach($this->req_capability as $cap) {
if (has_capability($cap, $context)) {
if (is_valid_capability($cap) and has_capability($cap, $context)) {
return true;
}
}
@@ -2346,7 +2346,7 @@ class admin_settingpage extends part_of_admin_tree {
}
$context = empty($this->context) ? get_context_instance(CONTEXT_SYSTEM) : $this->context;
foreach($this->req_capability as $cap) {
if (has_capability($cap, $context)) {
if (is_valid_capability($cap) and has_capability($cap, $context)) {
return true;
}
}