Merge branch 'MDL-27953_m25' of https://github.com/markn86/moodle int…

…o MOODLE_25_STABLE
moodle · Aug 5, 2013 · a2f561b · a2f561b
2 parents eeb784d + 8a868ab
commit a2f561b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/admin/tool/uploaduser/locallib.php b/admin/tool/uploaduser/locallib.php
@@ -321,8 +321,8 @@ function uu_process_template_callback($username, $firstname, $lastname, $block)
  * @return array type=>name
  */
 function uu_supported_auths() {
-    // only following plugins are guaranteed to work properly
-    $whitelist = array('manual', 'nologin', 'none', 'email');
+    // Only the following plugins are guaranteed to work properly.
+    $whitelist = array('email', 'ldap', 'manual', 'nologin', 'none');
     $plugins = get_enabled_auth_plugins();
     $choices = array();
     foreach ($plugins as $plugin) {