MDL-8352 Fully separate CONTEXT_COURSE, SITEID from COURSE_SYSTEM - code cleanup

diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php
index 99c9cffc412c4b9d8151483c06ac7d8e5e2ad147..5c5e245b24c84bf32fe3b9d57369d6b27ffd2219 100644 (file)
--- a/admin/mnet/access_control.php
+++ b/admin/mnet/access_control.php
@@ -24,7 +24,7 @@ if (!extension_loaded('openssl')) {
     print_error('requiresopenssl', 'mnet', '', NULL, true);
 }
 
-$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+$sitecontext = get_context_instance(CONTEXT_SYSTEM);
 $sesskey = sesskey();
 $formerror = array();
 

diff --git a/admin/mnet/delete.php b/admin/mnet/delete.php
index 37920c6f8029db7c13f91fd38f3bae7fc5d7431d..56ace95b595234fa11ce30a68154205ea6cf1fd1 100644 (file)
--- a/admin/mnet/delete.php
+++ b/admin/mnet/delete.php
@@ -10,7 +10,7 @@
     $strmnetedithost   = get_string('reviewhostdetails', 'mnet');
     require_login();
 
-    $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $context = get_context_instance(CONTEXT_SYSTEM);
     
     require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 

diff --git a/admin/mnet/index.php b/admin/mnet/index.php
index cad87c35a7e46eb40f3e9abd0852eb0e2dabc744..90212f2cca5336427f5878130fa480b338ed3d28 100644 (file)
--- a/admin/mnet/index.php
+++ b/admin/mnet/index.php
@@ -10,7 +10,7 @@
     $adminroot = admin_get_root();
     admin_externalpage_setup('net', $adminroot);
 
-    $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $context = get_context_instance(CONTEXT_SYSTEM);
 
     require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 

diff --git a/admin/mnet/mnet_services.php b/admin/mnet/mnet_services.php
index 75fede98881ac1ab0b8d245d6a23e91d2f0f9a13..bed8c3cdf5d75870038ded28a75ef492f9a46ef4 100644 (file)
--- a/admin/mnet/mnet_services.php
+++ b/admin/mnet/mnet_services.php
@@ -9,7 +9,7 @@
     $adminroot = admin_get_root();
     admin_externalpage_setup('mnetpeers', $adminroot);
 
-    $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $context = get_context_instance(CONTEXT_SYSTEM);
 
     require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 

diff --git a/admin/mnet/peers.php b/admin/mnet/peers.php
index 15c8ddbf78fa152c448171aae39edcd56794aa24..afdf28fe6234fda8e9feefcd481a5733faf999b8 100644 (file)
--- a/admin/mnet/peers.php
+++ b/admin/mnet/peers.php
@@ -10,7 +10,7 @@ require_login();
 $adminroot = admin_get_root();
 admin_externalpage_setup('mnetpeers', $adminroot);
 
-$context = get_context_instance(CONTEXT_SYSTEM, SITEID);
+$context = get_context_instance(CONTEXT_SYSTEM);
 
 require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 

diff --git a/admin/mnet/trustedhosts.php b/admin/mnet/trustedhosts.php
index 0ea3505c0b5a8589ee5f2283e4380ab653668311..9c04203d0d41a35e6b0ff7e9534e07e4777e00f5 100644 (file)
--- a/admin/mnet/trustedhosts.php
+++ b/admin/mnet/trustedhosts.php
@@ -9,7 +9,7 @@
     $adminroot = admin_get_root();
     admin_externalpage_setup('trustedhosts', $adminroot);
 
-    $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $context = get_context_instance(CONTEXT_SYSTEM);
 
     require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");