Browse files

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

…o MOODLE_25_STABLE
  • Loading branch information...
2 parents eeb784d + 8a868ab commit a2f561b6a7401bd3d1748235a3465d80a58dbf1a Sam Hemelryk committed Aug 6, 2013
Showing with 2 additions and 2 deletions.
  1. +2 −2 admin/tool/uploaduser/locallib.php
View
4 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) {

0 comments on commit a2f561b

Please sign in to comment.