Permalink
Browse files

MDL-22510 libraries: Set wantsurl only when $setwantsurltome is set in

require_login
  • Loading branch information...
ankitagarwal committed Mar 23, 2012
1 parent c856a1f commit af572078cfbe16e7ab26f968384cbbd9d36548c8
Showing with 15 additions and 5 deletions.
  1. +15 −5 lib/moodlelib.php
View
@@ -2726,7 +2726,9 @@ function require_login($courseorid = NULL, $autologinguest = true, $cm = NULL, $
if (get_user_preferences('auth_forcepasswordchange') && !session_is_loggedinas()) {
$userauth = get_auth_plugin($USER->auth);
if ($userauth->can_change_password() and !$preventredirect) {
- $SESSION->wantsurl = $FULLME;
+ if ($setwantsurltome) {
+ $SESSION->wantsurl = $FULLME;
+ }
if ($changeurl = $userauth->change_password_url()) {
//use plugin custom url
redirect($changeurl);
@@ -2749,7 +2751,9 @@ function require_login($courseorid = NULL, $autologinguest = true, $cm = NULL, $
if ($preventredirect) {
throw new require_login_exception('User not fully set-up');
}
- $SESSION->wantsurl = $FULLME;
+ if ($setwantsurltome) {
+ $SESSION->wantsurl = $FULLME;
+ }
redirect($CFG->wwwroot .'/user/edit.php?id='. $USER->id .'&course='. SITEID);
}
@@ -2769,13 +2773,17 @@ function require_login($courseorid = NULL, $autologinguest = true, $cm = NULL, $
if ($preventredirect) {
throw new require_login_exception('Policy not agreed');
}
- $SESSION->wantsurl = $FULLME;
+ if ($setwantsurltome) {
+ $SESSION->wantsurl = $FULLME;
+ }
redirect($CFG->wwwroot .'/user/policy.php');
} else if (!empty($CFG->sitepolicyguest) and isguestuser()) {
if ($preventredirect) {
throw new require_login_exception('Policy not agreed');
}
- $SESSION->wantsurl = $FULLME;
+ if ($setwantsurltome) {
+ $SESSION->wantsurl = $FULLME;
+ }
redirect($CFG->wwwroot .'/user/policy.php');
}
}
@@ -2927,7 +2935,9 @@ function require_login($courseorid = NULL, $autologinguest = true, $cm = NULL, $
if ($preventredirect) {
throw new require_login_exception('Not enrolled');
}
- $SESSION->wantsurl = $FULLME;
+ if ($setwantsurltome) {
+ $SESSION->wantsurl = $FULLME;
+ }
redirect($CFG->wwwroot .'/enrol/index.php?id='. $course->id);
}
}

0 comments on commit af57207

Please sign in to comment.