From 82b04884f300957ea942e44935c3bc3e7e19a414 Mon Sep 17 00:00:00 2001 From: dongsheng Date: Wed, 23 Apr 2008 08:11:31 +0000 Subject: [PATCH] MDL-14460, fix get_context_instance, see tracker --- course/import/activities/index.php | 2 +- course/import/activities/mod.php | 2 +- course/report/log/lib.php | 4 ++-- course/report/stats/lib.php | 2 +- filter/algebra/filter.php | 2 +- filter/tex/filter.php | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/course/import/activities/index.php b/course/import/activities/index.php index 8b593cacd..3aea679af 100644 --- a/course/import/activities/index.php +++ b/course/import/activities/index.php @@ -25,7 +25,7 @@ if ($fromcourse) { $fromcontext = get_context_instance(CONTEXT_COURSE, $fromcourse); } - $syscontext = get_context_instance(CONTEXT_SYSTEM, SITEID); + $syscontext = get_context_instance(CONTEXT_SYSTEM); if (!has_capability('moodle/course:manageactivities', $tocontext)) { error("You need do not have the required permissions to import activities to this course"); diff --git a/course/import/activities/mod.php b/course/import/activities/mod.php index 9debf7f37..2cdcab69e 100644 --- a/course/import/activities/mod.php +++ b/course/import/activities/mod.php @@ -7,7 +7,7 @@ require_once($CFG->dirroot.'/course/lib.php'); require_once($CFG->dirroot.'/backup/restorelib.php'); - $syscontext = get_context_instance(CONTEXT_SYSTEM, SITEID); + $syscontext = get_context_instance(CONTEXT_SYSTEM); // if we're not a course creator , we can only import from our own courses. if (has_capability('moodle/course:create', $syscontext)) { diff --git a/course/report/log/lib.php b/course/report/log/lib.php index 4e058dc0f..5a82e73c9 100644 --- a/course/report/log/lib.php +++ b/course/report/log/lib.php @@ -19,7 +19,7 @@ function print_mnet_log_selector_form($hostid, $course, $selecteduser=0, $select $showcourses = 1; } - $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID); + $sitecontext = get_context_instance(CONTEXT_SYSTEM); // Context for remote data is always SITE // Groups for remote data are always OFF @@ -286,7 +286,7 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate='today' $showcourses = 1; } - $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID); + $sitecontext = get_context_instance(CONTEXT_SYSTEM); $context = get_context_instance(CONTEXT_COURSE, $course->id); /// Setup for group handling. diff --git a/course/report/stats/lib.php b/course/report/stats/lib.php index ab934ce70..be81872fc 100644 --- a/course/report/stats/lib.php +++ b/course/report/stats/lib.php @@ -21,7 +21,7 @@ $options = array(); $options[STATS_MODE_GENERAL] = get_string('statsmodegeneral'); $options[STATS_MODE_DETAILED] = get_string('statsmodedetailed'); - if (has_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID))) { + if (has_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM))) { $options[STATS_MODE_RANKED] = get_string('reports'); } diff --git a/filter/algebra/filter.php b/filter/algebra/filter.php index eee12c34f..bdd6d1d16 100644 --- a/filter/algebra/filter.php +++ b/filter/algebra/filter.php @@ -61,7 +61,7 @@ function string_file_picture_algebra($imagefile, $tex= "", $height="", $width="" } $style .= '"'; if ($imagefile) { - if (!file_exists("$CFG->dataroot/filter/algebra/$imagefile") && has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) { + if (!file_exists("$CFG->dataroot/filter/algebra/$imagefile") && has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) { $output .= "wwwroot/filter/algebra/algebradebug.php\">"; } else { $output .= "dataroot/filter/tex/$imagefile") && has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) { + if (!file_exists("$CFG->dataroot/filter/tex/$imagefile") && has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) { $output .= "wwwroot/filter/tex/texdebug.php\">"; } else { $output .= "