mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-04 15:57:45 +02:00
Code Issues Releases Wiki Activity

- a bunch of bugfixes. :P

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@5678 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-03-21 19:23:34 +00:00
parent 44c60cff4d
commit 21de871aff
47 changed files with 200 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
phpBB/includes/functions.php
View File

@@ -1385,7 +1385,16 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
$redirect = request_var('redirect', "index.$phpEx$SID");
meta_refresh(3, $redirect);
$message = (($l_success) ? $l_success : $user->lang['LOGIN_REDIRECT']) . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a> ');
$message = ($l_success) ? $l_success : $user->lang['LOGIN_REDIRECT'];
if ($admin)
{
$message .= '<br /><br />' . sprintf($user->lang['PROCEED_TO_ACP'], '<a href="' . $redirect . '">', '</a> ');
}
else
{
$message .= '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a> ');
}
trigger_error($message);
}
@@ -1671,12 +1680,8 @@ function extension_allowed($forum_id, $extension, &$extensions)
return (!in_array($forum_id, $check)) ? false : true;
}
else
{
return ($forum_id == 0) ? false : true;
}
return false;
return ($forum_id == 0) ? false : true;
}
/**
@@ -2403,7 +2408,7 @@ function get_backtrace()
break;
case 'resource':
$args[] = 'Resource(' . strstr($a, '#') . ')';
$args[] = 'Resource(' . strstr($argument, '#') . ')';
break;
case 'boolean':