1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 11:13:59 +02:00

merge some changes/fixes

henry: is your viewonline fix/change missing? ;)

git-svn-id: file:///svn/phpbb/trunk@8503 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2008-04-11 14:21:45 +00:00
parent 82454165c3
commit dbae1db24c
7 changed files with 43 additions and 34 deletions

View File

@@ -21,7 +21,7 @@ date_default_timezone_set('UTC');
require($phpbb_root_path . 'config.' . $phpEx);
if (!defined('PHPBB_INSTALLED') || empty($dbms) || !isset($dbhost) || !isset($dbpasswd) || empty($dbuser))
if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type))
{
exit;
}
@@ -58,11 +58,6 @@ if (strspn($sid, 'abcdefABCDEF0123456789') !== strlen($sid))
// server a little
if ($id)
{
if (empty($acm_type) || empty($dbms))
{
die('Hacking attempt');
}
// Include files
require($phpbb_root_path . 'includes/acm/acm_' . $acm_type . '.' . $phpEx);
require($phpbb_root_path . 'includes/cache.' . $phpEx);