MDL-14605 removing roles upgrade links, only installation needed in HEAD

diff --git a/admin/cliupgrade.php b/admin/cliupgrade.php
index df8dac17d77cb5c77c1a76f1a9ad8eb5a8ccfa79..e3ddd7f03cb6728a29e1dc1165d291b2f799879a 100644 (file)
--- a/admin/cliupgrade.php
+++ b/admin/cliupgrade.php
@@ -1022,11 +1022,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
             /// If successful, continue upgrading roles and setting everything properly
             if ($status) {
-                if (empty($CFG->rolesactive)) {
-                    // Upgrade to the roles system.
-                    moodle_install_roles();
-                    set_config('rolesactive', 1);
-                } else if (!update_capabilities()) {
+                if (!update_capabilities()) {
                     console_write(STDERR,'Had trouble upgrading the core capabilities for the Roles System','',false);
                 }
                 if (set_config("version", $version)) {

diff --git a/admin/index.php b/admin/index.php
index 60cb459538b9b9bcee302f703d11f590f6b6c6de..09f39f5b16642e5710c593d23bb6b63e408fa7ff 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -348,13 +348,7 @@
                 $db->debug=false;
             /// If successful, continue upgrading roles and setting everything properly
                 if ($status) {
-                    if (empty($CFG->rolesactive)) {
-                        // Groups upgrade is now in core above.
-
-                        // Upgrade to the roles system.
-                        moodle_install_roles();
-                        set_config('rolesactive', 1);
-                    } else if (!update_capabilities()) {
+                    if (!update_capabilities()) {
                         print_error('cannotupgradecapabilities', 'debug');
                     }