0004555: [administration] Warnings on set_time_limit() in safe mode (…

…vboctor) git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/trunk@3015 f5dc347c-c33d-0410-90a0-b07cc1902cb9
mantisbt · Sep 28, 2004 · 974dc7a · 974dc7a
1 parent d953f72
commit 974dc7a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/core/file_api.php b/core/file_api.php
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: file_api.php,v 1.57 2004-09-28 00:56:13 thraxisp Exp $
+	# $Id: file_api.php,v 1.58 2004-09-28 23:00:48 vboctor Exp $
 	# --------------------------------------------------------
 
 	$t_core_dir = dirname( __FILE__ ).DIRECTORY_SEPARATOR;
@@ -317,13 +317,13 @@ function file_ftp_connect() {
 	# --------------------
 	# Put a file to the ftp server.
 	function file_ftp_put ( $p_conn_id, $p_remote_filename, $p_local_filename ) {
-		set_time_limit( 0 );
+		helper_begin_long_process();
 		$upload = ftp_put( $p_conn_id, $p_remote_filename, $p_local_filename, FTP_BINARY);
 	}
 	# --------------------
 	# Get a file from the ftp server.
 	function file_ftp_get ( $p_conn_id, $p_local_filename, $p_remote_filename ) {
-		set_time_limit( 0 );
+		helper_begin_long_process();
 		$download = ftp_get( $p_conn_id, $p_local_filename, $p_remote_filename, FTP_BINARY);
 	}
 	# --------------------

diff --git a/core/helper_api.php b/core/helper_api.php
@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: helper_api.php,v 1.51 2004-08-01 03:29:25 narcissus Exp $
+	# $Id: helper_api.php,v 1.52 2004-09-28 23:00:48 vboctor Exp $
 	# --------------------------------------------------------
 
 	### Helper API ###
@@ -139,7 +139,9 @@ function check_checked( $p_var, $p_val=true ) {
 	function helper_begin_long_process( $p_ignore_abort=false ) {
 		$t_timeout = config_get( 'long_process_timeout' );
 
-		set_time_limit( $t_timeout );
+		# silent errors or warnings reported when safe_mode is ON.
+		@set_time_limit( $t_timeout );
+
 		ignore_user_abort( $p_ignore_abort );
 		return $t_timeout;
 	}

diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -2,6 +2,7 @@ Mantis ChangeLog
 
 2004.10.xx  -  0.19.1
 
+- 0004555: [administration] Warnings on set_time_limit() in safe mode (vboctor)
 - 0004528: [localization] Error on logout page with language=auto (thraxisp)
 - 0004393: [feature] Version should be add with advanced options (bpfennig)
 - 0004363: [bugtracker] "Add user to project" should have an additional button (bpfennig)