fixed collisions in merges, sorry

diff --git a/admin/auth.php b/admin/auth.php
index 5e7c37b450f6eee5dc4af2fc4e52e234e695cad6..42a757323b28768f5603f47ae287a4c23c4bffa2 100644 (file)
--- a/admin/auth.php
+++ b/admin/auth.php
@@ -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);
 

diff --git a/admin/enrol.php b/admin/enrol.php
index 8c00b8e3a523e119645afd6446e906c990949bed..9e1da25dcaebbe842cc853a54a7dd19097de4945 100644 (file)
--- a/admin/enrol.php
+++ b/admin/enrol.php
@@ -9,7 +9,7 @@
     $CFG->pagepath = 'enrol';
     
     $adminroot = admin_get_root();
-    admin_externalpage_setup('enrolmentplugins', $adminroot);
+    admin_externalpage_setup('enrolment', $adminroot);
 
 
 

diff --git a/admin/maintenance.php b/admin/maintenance.php
index 9763989ed734feed6bfe934531185621dd5fc6ba..9b4f2d9bb76117bc0e13757b9ca52a367280198b 100644 (file)
--- a/admin/maintenance.php
+++ b/admin/maintenance.php
@@ -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

diff --git a/admin/roles/manage.php b/admin/roles/manage.php
index 689940f57aa00a0fabe6014cc3b64d1035ae6242..72f887f85a47082bef06c0d9ef3d92dcf549cee4 100755 (executable)
--- a/admin/roles/manage.php
+++ b/admin/roles/manage.php
@@ -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