Version 3.1.4

upload/initdata.php

@@ -1,17 +1,19 @@
 <?php
 
 /**
+ * <pre>
  * Invision Power Services
- * IP.Board v3.0.5
+ * IP.Board v3.1.4
  * INIT File - Sets up globals
- * Last Updated: $Date: 2009-10-21 20:34:34 -0400 (Wed, 21 Oct 2009) $
+ * Last Updated: $Date: 2010-10-27 17:31:21 -0400 (Wed, 27 Oct 2010) $
+ * </pre>
  *
  * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2008 Invision Power Services, Inc.
- * @license		http://www.iinvisionpower.com/community/board/license.html
- * @package		Invision Power Board
- * @link		http://www.iinvisionpower.com
- * @version		$Rev: 5256 $
+ * @license		http://www.invisionpower.com/community/board/license.html
+ * @package		IP.Board
+ * @link		http://www.invisionpower.com
+ * @version		$Rev: 7058 $
  *
  */
 
@@ -169,14 +171,14 @@ define( 'IPS_SQL_DEBUG_MODE', 0 );
 *
 * Logs all queries using filesort and/or temp tables
 */
-define( 'IPS_SQL_FIND_EVIL_MODE', 0 );
+define( 'IPS_SQL_FIND_EVIL_MODE', false );
 
 /**
 * SQL FIND SLOW QUERIES MODE
 *
 * Logs all queries that take longer than X seconds (0.1), etc
 */
-define( 'IPS_SQL_FIND_SLOW_MODE', 0 );
+define( 'IPS_SQL_FIND_SLOW_MODE', false );
 
 /**
 * MEMORY DEBUG MODE
@@ -327,14 +329,10 @@ else
 
 if ( @function_exists("set_time_limit") == 1 and SAFE_MODE_ON == 0 )
 {
-	if ( defined('IPS_IS_SHELL') AND IPS_IS_SHELL )
+	if ( ( defined('IPS_IS_SHELL') AND IPS_IS_SHELL ) OR ( IPS_AREA != 'public' ) )
 	{
 		@set_time_limit(0);
 	}
-	else
-	{
-		@set_time_limit( IPS_AREA == 'public' ? 30 : 0 );
-	}
 }
 
 /**
@@ -390,7 +388,7 @@ function my_getenv($key)
 */
 if (!function_exists('json_encode'))
 {
-	function json_encode( $a )
+	function json_encode( $a, $flag=null )
 	{
 		require_once( IPS_KERNEL_PATH . 'PEAR/JSON/JSON.php' );