[mxbb-commits] core/install mx_install.php,1.70,1.71

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/install
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6813/install

Modified Files:
	mx_install.php 
Log Message:
register global fix for installation script
updated htaccess

Index: mx_install.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/mx_install.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** mx_install.php	4 Sep 2006 16:48:43 -0000	1.70
--- mx_install.php	14 Sep 2006 18:01:15 -0000	1.71
***************
*** 39,43 ****
  // This is shown in the top right corner of the installation panels.
  //
! define('INSTALLER_VERSION', '2.8.0');
  define('INSTALLER_NAME', 'mxBB-IWizard');
  
--- 39,43 ----
  // This is shown in the top right corner of the installation panels.
  //
! define('INSTALLER_VERSION', '2.1.0');
  define('INSTALLER_NAME', 'mxBB-IWizard');
  
***************
*** 71,74 ****
--- 71,76 ----
  //
  error_reporting  (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
+ include($mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.php'); // For nice error output
+ 
  set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
  
***************
*** 108,112 ****
  {
  	// PHP4+ path
! 	$not_unset = array('HTTP_GET_VARS', 'HTTP_POST_VARS', 'HTTP_COOKIE_VARS', 'HTTP_SERVER_VARS', 'HTTP_SESSION_VARS', 'HTTP_ENV_VARS', 'HTTP_POST_FILES', 'phpEx', 'phpbb_root_path');
  
  	// Not only will array_merge give a warning if a parameter
--- 110,114 ----
  {
  	// PHP4+ path
! 	$not_unset = array('HTTP_GET_VARS', 'HTTP_POST_VARS', 'HTTP_COOKIE_VARS', 'HTTP_SERVER_VARS', 'HTTP_SESSION_VARS', 'HTTP_ENV_VARS', 'HTTP_POST_FILES', 'phpEx');
  
  	// Not only will array_merge give a warning if a parameter
***************
*** 120,124 ****
  	// Merge all into one extremely huge array; unset
  	// this later
! 	$input = array_merge($HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_COOKIE_VARS, $HTTP_SERVER_VARS, $HTTP_SESSION_VARS, $HTTP_ENV_VARS, $HTTP_POST_FILES);
  
  	unset($input['input']);
--- 122,130 ----
  	// Merge all into one extremely huge array; unset
  	// this later
! 	//
! 	// Note! Since array_merge() destroys numerical keys - if the array is numerically indexed, the keys get reindexed in a continuous way - we use the + operator instead
! 	//
! 	//$input = array_merge($HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_COOKIE_VARS, $HTTP_SERVER_VARS, $HTTP_SESSION_VARS, $HTTP_ENV_VARS, $HTTP_POST_FILES);
! 	$input = $HTTP_GET_VARS + $HTTP_POST_VARS + $HTTP_COOKIE_VARS + $HTTP_SERVER_VARS + $HTTP_SESSION_VARS + $HTTP_ENV_VARS + $HTTP_POST_FILES;
  
  	unset($input['input']);