merged, fixed hard coded auth method "ldap"

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index ea88e969c76d4a9f29804cbcbbb7576274cd247d..927f81b540744fda4fad2951f76946955c2bd3c0 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2405,7 +2405,7 @@ function authenticate_user_login($username, $password) {
                 $creatorrole = array_shift($creatorroles); // We can only use one, let's use the first one
                 // Check if the user is a creator
                 if (auth_iscreator($username)) { // Following calls will not create duplicates
-                    role_assign($creatorrole->id, $user->id, 0, $sitecontext->id, 0, 0, 0, 'ldap');
+                    role_assign($creatorrole->id, $user->id, 0, $sitecontext->id, 0, 0, 0, $auth);
                 } else {
                     role_unassign($creatorrole->id, $user->id, 0, $sitecontext->id);
                 }