L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-14460, fix get_context_instance, merged from MOODLE_19_STABLE, see tracker.

Browse Source
This commit is contained in:
dongsheng
2008-04-22 06:24:14 +00:00
parent dde73b9e69
commit ef35441d27
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/lib.php
+2 -2
View File
@@ -1292,7 +1292,7 @@ function calendar_set_filters(&$courses, &$group, &$user, $courseeventsfrom = NU
}
// XXX TODO: not sure how to replace $CFG->calendar_adminseesall
if(has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID)) && !empty($CFG->calendar_adminseesall)) {
if(has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM)) && !empty($CFG->calendar_adminseesall)) {
$group = true;
}
else {
@@ -1377,7 +1377,7 @@ function calendar_edit_event_allowed($event) {
return false;
}
$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
$sitecontext = get_context_instance(CONTEXT_SYSTEM);
// if user has manageentries at site level, return true
if (has_capability('moodle/calendar:manageentries', $sitecontext)) {
return true;
calendar/view.php
+1 -1
View File
@@ -608,7 +608,7 @@ function calendar_course_filter_selector($getvars = '') {
return '';
}
if (has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID)) && !empty($CFG->calendar_adminseesall)) {
if (has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM)) && !empty($CFG->calendar_adminseesall)) {
$courses = get_courses('all', 'c.shortname','c.id,c.shortname');
} else {
$courses = get_my_courses($USER->id, 'shortname');
mnet/testclient.php
+1 -1
View File
@@ -14,7 +14,7 @@ require_once(dirname(dirname(__FILE__)) . '/config.php');
require_once $CFG->dirroot.'/mnet/xmlrpc/client.php';
// Site admins only, thanks.
$context = get_context_instance(CONTEXT_SYSTEM, SITEID);
$context = get_context_instance(CONTEXT_SYSTEM);
require_capability('moodle/site:config', $context);
error_reporting(E_ALL);
user/profile/lib.php
+4 -4
View File
@@ -65,7 +65,7 @@ class profile_field_base {
function edit_field(&$mform) {
if ($this->field->visible != PROFILE_VISIBLE_NONE
or has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
or has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM))) {
$this->edit_field_add($mform);
$this->edit_field_set_default($mform);
@@ -127,7 +127,7 @@ class profile_field_base {
* @param object instance of the moodleform class
*/
function edit_field_set_required(&$mform) {
if ($this->is_required() and !has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
if ($this->is_required() and !has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM))) {
$mform->addRule($this->inputname, get_string('required'), 'required', null, 'client');
}
}
@@ -137,7 +137,7 @@ class profile_field_base {
* @param object instance of the moodleform class
*/
function edit_field_set_locked(&$mform) {
if ($this->is_locked() and !has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
if ($this->is_locked() and !has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM))) {
$mform->hardFreeze($this->inputname);
}
}
@@ -229,7 +229,7 @@ class profile_field_base {
case PROFILE_VISIBLE_PRIVATE:
return ($this->userid == $USER->id);
default:
return has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM, SITEID));
return has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM));
}
}
userpix/index.php
+1 -1
View File
@@ -11,7 +11,7 @@
require_login();
/// Remove the following three lines if you want everyone to access it
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
if (!$users = get_records("user", "picture", "1", "lastaccess DESC", "id,firstname,lastname")) {
print_error("no users!");
userpix/upgrade.php
+1 -1
View File
@@ -7,7 +7,7 @@
require_login();
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
if (!$users = get_records("user", "picture", "1", "lastaccess DESC", "id,firstname,lastname")) {
print_error("no users!");