[Mantisbt-cvs] mantisbt/core error_api.php,1.35,1.36

[Victor B. <vb...@us...>]

Update of /cvsroot/mantisbt/mantisbt/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12374/core

Modified Files:
	error_api.php 
Log Message:
Fixed 4745: PHP 5 array_merge() change causes errors

Index: error_api.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core/error_api.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- error_api.php	21 Sep 2004 17:58:17 -0000	1.35
+++ error_api.php	24 Oct 2004 14:12:47 -0000	1.36
@@ -302,7 +302,7 @@
 
 		$t_error = $MANTIS_ERROR[$p_error];
 
-		return call_user_func_array( 'sprintf', array_merge( $t_error, $g_error_parameters, $t_padding ) );
+		return call_user_func_array( 'sprintf', array_merge( array( $t_error ), $g_error_parameters, $t_padding ) );
 	}
 
 	# ---------------