MDL-21342 auth: tidy up pre-integration

ralferlebach · Jan 8, 2013 · be5a316 · be5a316
1 parent 70601b9
commit be5a316
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/auth/ldap/auth.php b/auth/ldap/auth.php
@@ -1643,7 +1643,7 @@ function ntlmsso_finish() {
         $username   = $cf[$key];
         // Here we want to trigger the whole authentication machinery
         // to make sure no step is bypassed...
-        $user = authenticate_user_login($username, $key, false);
+        $user = authenticate_user_login($username, $key);
         if ($user) {
             add_to_log(SITEID, 'user', 'login', "view.php?id=$USER->id&course=".SITEID,
                        $user->id, 0, $user->id);

diff --git a/lang/en/admin.php b/lang/en/admin.php
@@ -636,7 +636,7 @@
 
 In most mail programs, this should appear as a blue link
 which you can just click on.  If that doesn\'t work,
-then cut and paste the address into the address
+then copy and paste the address into the address
 line at the top of your web browser window.
 
 If you need help, please contact the site administrator,

diff --git a/version.php b/version.php
@@ -30,7 +30,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 
-$version  = 2012120300.07;              // YYYYMMDD      = weekly release date of this DEV branch
+$version  = 2012120300.08;              // YYYYMMDD      = weekly release date of this DEV branch
                                         //         RR    = release increments - 00 in DEV branches
                                         //           .XX = incremental changes