From: skodak Date: Thu, 7 Sep 2006 19:40:57 +0000 (+0000) Subject: double redirect prevention - if both 'meta http-equiv' and javascript redirects are... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=42d6be31d1e8c8902f865488020dacddefa8ab44;p=moodle.git double redirect prevention - if both 'meta http-equiv' and javascript redirects are used, javascript delay is 3 seconds longer to prevent accidental double redirects. The target page can still be loaded twice in case user clicks the link before the target page gets fully loaded. --- diff --git a/lib/weblib.php b/lib/weblib.php index 24e4867cdc..48cb54800f 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -4579,7 +4579,9 @@ function redirect($url, $message='', $delay=-1) { $delay = 3; // if no delay specified wait 3 seconds } if (! defined('HEADER_PRINTED')) { + // this type of redirect might not be working in some browsers - such as lynx :-( print_header('', '', '', '', ''); + $delay += 3; // double redirect prevention, it was sometimes breaking upgrades before 1.7 } echo '
'; echo '

'. $message .'

'; @@ -4593,7 +4595,7 @@ function redirect($url, $message='', $delay=-1) { function redirect() { document.location.replace(''); } - setTimeout("redirect()", ); + setTimeout("redirect()", ); -->