Merge branch 'MDL-41598-master' of https://github.com/mackensen/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 27 Jul 2015 14:24:31 +0000 (15:24 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 27 Jul 2015 14:24:31 +0000 (15:24 +0100)
auth/shibboleth/index.php

index ef38337..4e5c92a 100644 (file)
@@ -10,7 +10,7 @@
 
     // Support for WAYFless URLs.
     $target = optional_param('target', '', PARAM_LOCALURL);
-    if (!empty($target)) {
+    if (!empty($target) && empty($SESSION->wantsurl)) {
         $SESSION->wantsurl = $target;
     }