Fix 5612: Redirect time ignored in preferences

git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/branches/BRANCH_1_1_0@4642 f5dc347c-c33d-0410-90a0-b07cc1902cb9
mantisbt · Oct 16, 2007 · 54c508b · 54c508b
1 parent 9fab30d
commit 54c508b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/config_defaults_inc.php b/config_defaults_inc.php
@@ -18,7 +18,7 @@
 # along with Mantis.  If not, see <http://www.gnu.org/licenses/>.
 
 	# --------------------------------------------------------
-	# $Id: config_defaults_inc.php,v 1.364.2.3 2007-10-14 22:35:35 giallu Exp $
+	# $Id: config_defaults_inc.php,v 1.364.2.4 2007-10-16 22:15:29 giallu Exp $
 	# --------------------------------------------------------
 
 
@@ -588,14 +588,9 @@
 	# Mantis Time Settings
 	############################
 
-	# --- time varaibles --------------
-
 	# time for 'permanent' cookie to live in seconds (1 year)
 	$g_cookie_time_length	= 30000000;
 
-	# time to delay between page redirects (in seconds)
-	$g_wait_time			= 2;
-
 	# minutes to wait before document is stale (in minutes)
 	$g_content_expire		= 0;
 

diff --git a/core/html_api.php b/core/html_api.php
@@ -18,7 +18,7 @@
 # along with Mantis.  If not, see <http://www.gnu.org/licenses/>.
 
 	# --------------------------------------------------------
-	# $Id: html_api.php,v 1.218.2.1 2007-10-13 22:35:31 giallu Exp $
+	# $Id: html_api.php,v 1.218.2.2 2007-10-16 22:15:31 giallu Exp $
 	# --------------------------------------------------------
 
 	###########################################################################
@@ -248,7 +248,7 @@ function html_meta_redirect( $p_url, $p_time = null, $p_sanitize = false ) {
 		}
 
 		if ( null === $p_time ) {
-			$p_time = config_get( 'wait_time' );
+			$p_time = current_user_get_pref( 'redirect_delay' );
 		}
 
 		if ( $p_sanitize ) {

diff --git a/core/obsolete.php b/core/obsolete.php
@@ -18,7 +18,7 @@
 # along with Mantis.  If not, see <http://www.gnu.org/licenses/>.
 
 	# --------------------------------------------------------
-	# $Id: obsolete.php,v 1.32.2.1 2007-10-13 22:35:38 giallu Exp $
+	# $Id: obsolete.php,v 1.32.2.2 2007-10-16 22:15:41 giallu Exp $
 	# --------------------------------------------------------
 
 	### Obsolete API ###
@@ -117,4 +117,7 @@
 # changes in 1.1.0rc1
 	config_obsolete( 'show_notices', 'display_errors' );
 	config_obsolete( 'show_warnings', 'display_errors' );
+
+# changes in 1.1.0rc2
+	config_obsolete( 'wait_time', 'default_redirect_delay' );
 ?>
diff --git a/doc/CUSTOMIZATION b/doc/CUSTOMIZATION
@@ -46,7 +46,7 @@ large files.
 * Most of the action scripts have a confirmation page to make sure the action
 completed successfully.  The pages will automatically redirect you after a
 short amount of time.  You can shorten of lengthen the time by editing
-$g_wait_time in config_inc.php.
+$g_default_redirect_delay in config_inc.php.
 
 * Edit css_inc.php to make your own page formatting.