Fix update of auth_source

1.9.x
Julio Montoya 10 years ago
parent 248066b6d0
commit c728fdf5d4
  1. 10
      main/inc/lib/usermanager.lib.php

@ -591,18 +591,16 @@ class UserManager
if ($reset_password == 0) { if ($reset_password == 0) {
$password = null; $password = null;
$auth_source = $user_info['auth_source'];
} elseif ($reset_password == 1) { } elseif ($reset_password == 1) {
$original_password = $password = api_generate_password(); $original_password = $password = api_generate_password();
$auth_source = PLATFORM_AUTH_SOURCE;
} elseif ($reset_password == 2) { } elseif ($reset_password == 2) {
$password = $password; $password = $password;
$auth_source = PLATFORM_AUTH_SOURCE;
} elseif ($reset_password == 3) { } elseif ($reset_password == 3) {
$password = $password; $password = $password;
$auth_source = $auth_source;
} }
$auth_source = !empty($auth_source) ? $auth_source : PLATFORM_AUTH_SOURCE;
if ($user_id != strval(intval($user_id))) if ($user_id != strval(intval($user_id)))
return false; return false;
if ($user_id === false) if ($user_id === false)
@ -2768,7 +2766,9 @@ class UserManager
to our user or not*/ to our user or not*/
$sql = "SELECT DISTINCT $sql = "SELECT DISTINCT
scu.course_code as code, c.visibility, c.id as real_id scu.course_code as code,
c.visibility,
c.id as real_id
FROM $tbl_session_course_user as scu FROM $tbl_session_course_user as scu
INNER JOIN $tbl_session_course sc INNER JOIN $tbl_session_course sc
ON (scu.id_session = sc.id_session AND scu.course_code = sc.course_code) ON (scu.id_session = sc.id_session AND scu.course_code = sc.course_code)

Loading…
Cancel
Save