Merge branch 'MDL-28466-master' of git://github.com/danpoltawski/moodle

2013-07-15 13:07:37 +10:00
parent 527b24b104 fdb0dfe7c0
commit 3fd0ea3c1e
16 changed files with 2 additions and 2824 deletions
@@ -636,6 +636,7 @@ class plugin_manager {
        // Moodle 2.3 supports upgrades from 2.2.x only.
        $plugins = array(
            'qformat' => array('blackboard'),
+            'enrol' => array('authorize'),
        );

        if (!isset($plugins[$type])) {
@@ -715,7 +716,7 @@ class plugin_manager {
            ),

            'enrol' => array(
-                'authorize', 'category', 'cohort', 'database', 'flatfile',
+                'category', 'cohort', 'database', 'flatfile',
                'guest', 'imsenterprise', 'ldap', 'manual', 'meta', 'mnet',
                'paypal', 'self'
            ),