moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

"MDL-14460,fix get_context_instance, merged from MOODLE_19_STABLE"

Browse source
This commit is contained in:
dongsheng 2008-04-30 04:46:46 +00:00
parent 33aa5723ca
commit d9d16e56a3
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
blog/edit.php
View file

@ -19,7 +19,7 @@ if (isguest()) {
print_error('noguestpost', 'blog'); print_error('noguestpost', 'blog');
} }
$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID); $sitecontext = get_context_instance(CONTEXT_SYSTEM);
if (!has_capability('moodle/blog:create', $sitecontext) and !has_capability('moodle/blog:manageentries', $sitecontext)) { if (!has_capability('moodle/blog:create', $sitecontext) and !has_capability('moodle/blog:manageentries', $sitecontext)) {
print_error('cannoteditpostorblog'); print_error('cannoteditpostorblog');
} }

2
blog/index.php
View file

@ -27,7 +27,7 @@ if (empty($CFG->bloglevel)) {
print_error('blogdisable', 'blog'); print_error('blogdisable', 'blog');
} }
$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID); $sitecontext = get_context_instance(CONTEXT_SYSTEM);
// change block edit staus if not guest and logged in // change block edit staus if not guest and logged in

10
blog/lib.php
View file

@ -77,7 +77,7 @@
$bloglimit = optional_param('limit', get_user_preferences('blogpagesize', 10), PARAM_INT); $bloglimit = optional_param('limit', get_user_preferences('blogpagesize', 10), PARAM_INT);
$start = $blogpage * $bloglimit; $start = $blogpage * $bloglimit;
$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID); $sitecontext = get_context_instance(CONTEXT_SYSTEM);
$morelink = '<br />&nbsp;&nbsp;'; $morelink = '<br />&nbsp;&nbsp;';
@ -369,7 +369,7 @@
global $CFG, $USER; global $CFG, $USER;
$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID); $sitecontext = get_context_instance(CONTEXT_SYSTEM);
if (has_capability('moodle/blog:manageentries', $sitecontext)) { if (has_capability('moodle/blog:manageentries', $sitecontext)) {
return true; // can edit any blog post return true; // can edit any blog post
@ -400,7 +400,7 @@
return true; // can view own posts in any case return true; // can view own posts in any case
} }
$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID); $sitecontext = get_context_instance(CONTEXT_SYSTEM);
if (has_capability('moodle/blog:manageentries', $sitecontext)) { if (has_capability('moodle/blog:manageentries', $sitecontext)) {
return true; // can manage all posts return true; // can manage all posts
} }
@ -524,7 +524,7 @@
$tagquerysql = ''; $tagquerysql = '';
} }
if (isloggedin() && !has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM, SITEID), $USER->id, false)) { if (isloggedin() && !has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM), $USER->id, false)) {
$permissionsql = 'AND (p.publishstate = \'site\' OR p.publishstate = \'public\' OR p.userid = '.$USER->id.')'; $permissionsql = 'AND (p.publishstate = \'site\' OR p.publishstate = \'public\' OR p.userid = '.$USER->id.')';
} else { } else {
$permissionsql = 'AND p.publishstate = \'public\''; $permissionsql = 'AND p.publishstate = \'public\'';
@ -532,7 +532,7 @@
// fix for MDL-9165, use with readuserblogs capability in a user context can read that user's private blogs // fix for MDL-9165, use with readuserblogs capability in a user context can read that user's private blogs
// admins can see all blogs regardless of publish states, as described on the help page // admins can see all blogs regardless of publish states, as described on the help page
if (has_capability('moodle/user:readuserblogs', get_context_instance(CONTEXT_SYSTEM, SITEID))) { if (has_capability('moodle/user:readuserblogs', get_context_instance(CONTEXT_SYSTEM))) {
$permissionsql = ''; $permissionsql = '';
} else if ($filtertype=='user' && has_capability('moodle/user:readuserblogs', get_context_instance(CONTEXT_USER, $filterselect))) { } else if ($filtertype=='user' && has_capability('moodle/user:readuserblogs', get_context_instance(CONTEXT_USER, $filterselect))) {
$permissionsql = ''; $permissionsql = '';

2
blog/preferences.php
View file

@ -8,7 +8,7 @@
if ($courseid == SITEID) { if ($courseid == SITEID) {
require_login(); require_login();
$context = get_context_instance(CONTEXT_SYSTEM, SITEID); $context = get_context_instance(CONTEXT_SYSTEM);
} else { } else {
require_login($courseid); require_login($courseid);
$context = get_context_instance(CONTEXT_COURSE, $courseid); $context = get_context_instance(CONTEXT_COURSE, $courseid);

2
calendar/lib.php
View file

@ -1416,7 +1416,7 @@ function calendar_get_default_courses($ignoreref = false) {
} }
$courses = array(); $courses = array();
if (has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID))) { if (has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_SYSTEM))) {
if (!empty($CFG->calendar_adminseesall)) { if (!empty($CFG->calendar_adminseesall)) {
$courses = get_records_sql('SELECT id, 1 FROM '.$CFG->prefix.'course'); $courses = get_records_sql('SELECT id, 1 FROM '.$CFG->prefix.'course');
return $courses; return $courses;