mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-11 19:24:01 +02:00
prepare new release - see changelog for changes
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@4926 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -43,7 +43,7 @@ else
|
||||
{
|
||||
$config_name = $row['config_name'];
|
||||
$config_value = $row['config_value'];
|
||||
$default_config[$config_name] = $config_value;
|
||||
$default_config[$config_name] = str_replace("'", "\'", $config_value);
|
||||
|
||||
$new[$config_name] = ( isset($HTTP_POST_VARS[$config_name]) ) ? $HTTP_POST_VARS[$config_name] : $default_config[$config_name];
|
||||
|
||||
|
@@ -332,7 +332,7 @@ elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' )
|
||||
WHERE s.session_logged_in = " . TRUE . "
|
||||
AND u.user_id = s.session_user_id
|
||||
AND u.user_id <> " . ANONYMOUS . "
|
||||
AND u.user_session_time >= " . ( time() - 300 ) . "
|
||||
AND s.session_time >= " . ( time() - 300 ) . "
|
||||
ORDER BY u.user_session_time DESC";
|
||||
if(!$result = $db->sql_query($sql))
|
||||
{
|
||||
|
Reference in New Issue
Block a user