mirror of
https://github.com/moodle/moodle.git
synced 2025-04-24 09:55:33 +02:00
fixed collisions in merges, sorry
This commit is contained in:
parent
11737b8bfa
commit
f21def1f11
@ -6,7 +6,7 @@
|
||||
require_once($CFG->libdir.'/adminlib.php');
|
||||
|
||||
$adminroot = admin_get_root();
|
||||
admin_externalpage_setup('authentication', $adminroot);
|
||||
admin_externalpage_setup('userauthentication', $adminroot);
|
||||
|
||||
$auth = optional_param('auth', '', PARAM_SAFEDIR);
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
$CFG->pagepath = 'enrol';
|
||||
|
||||
$adminroot = admin_get_root();
|
||||
admin_externalpage_setup('enrolmentplugins', $adminroot);
|
||||
admin_externalpage_setup('enrolment', $adminroot);
|
||||
|
||||
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
$action = optional_param('action', '', PARAM_ALPHA);
|
||||
|
||||
$adminroot = admin_get_root();
|
||||
admin_externalpage_setup('sitemaintenancemode', $adminroot);
|
||||
admin_externalpage_setup('maintenancemode', $adminroot);
|
||||
|
||||
//Check folder exists
|
||||
if (! make_upload_directory(SITEID)) { // Site folder
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
require_once($CFG->libdir.'/adminlib.php');
|
||||
$adminroot = admin_get_root();
|
||||
admin_externalpage_setup('manageroles', $adminroot);
|
||||
admin_externalpage_setup('defineroles', $adminroot);
|
||||
// require_login();
|
||||
|
||||
$roleid = optional_param('roleid', 0, PARAM_INT); // if set, we are editing a role
|
||||
|
Loading…
x
Reference in New Issue
Block a user