Update of /cvsroot/phpbb-php5mod/phpbb-php5
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14637
Modified Files:
common.php
Log Message:
Updating to phpBB 2.0.12. Release within 24 hours hopefully :)
Index: common.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/common.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** common.php 20 Nov 2004 01:01:10 -0000 1.4
--- common.php 22 Feb 2005 01:18:39 -0000 1.5
***************
*** 57,60 ****
--- 57,62 ----
if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
{
+ $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
// is not an array, it will actually fail. So we check if
***************
*** 70,79 ****
unset($input['input']);
!
while (list($var,) = @each($input))
{
! unset($$var);
! }
!
unset($input);
}
--- 72,85 ----
unset($input['input']);
! unset($input['not_unset']);
!
while (list($var,) = @each($input))
{
! if (!in_array($var, $not_unset))
! {
! unset($$var);
! }
! }
!
unset($input);
}
***************
*** 183,187 ****
// "clever" is doing harm rather than good ... karma is a great thing ... :)
//
! $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : $REMOTE_ADDR );
$user_ip = encode_ip($client_ip);
--- 189,193 ----
// "clever" is doing harm rather than good ... karma is a great thing ... :)
//
! $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : getenv('REMOTE_ADDR') );
$user_ip = encode_ip($client_ip);
|
