double redirect prevention - if both 'meta http-equiv' and javascript redirects are...

diff --git a/lib/weblib.php b/lib/weblib.php
index 24e4867cdc93f2588ae78fbc11a4caea1b195f8f..48cb54800faefadf63313b5adac7bc108b8d83e3 100644 (file)
--- 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('', '', '', '', '<meta http-equiv="refresh" content="'. $delay .'; url='. $encodedurl .'" />');
+        $delay += 3; // double redirect prevention, it was sometimes breaking upgrades before 1.7
     }
     echo '<center>';
     echo '<p>'. $message .'</p>';
@@ -4593,7 +4595,7 @@ function redirect($url, $message='', $delay=-1) {
   function redirect() {
       document.location.replace('<?php echo $surl ?>');
   }
-  setTimeout("redirect()", <?php echo (($delay * 1000) + 300) ?>);
+  setTimeout("redirect()", <?php echo ($delay * 1000) ?>);
 -->
 </script>
 <?php