diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-21 19:23:34 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-21 19:23:34 +0000 |
| commit | 21de871aff0392803dd98ab8a895fabac35f4219 (patch) | |
| tree | aa052fe762be977462e92b755e59dacb0c4ea559 /phpBB/includes/functions.php | |
| parent | 44c60cff4de351523f950ca7fac114d1a2769b82 (diff) | |
| download | forums-21de871aff0392803dd98ab8a895fabac35f4219.tar forums-21de871aff0392803dd98ab8a895fabac35f4219.tar.gz forums-21de871aff0392803dd98ab8a895fabac35f4219.tar.bz2 forums-21de871aff0392803dd98ab8a895fabac35f4219.tar.xz forums-21de871aff0392803dd98ab8a895fabac35f4219.zip | |
- a bunch of bugfixes. :P
git-svn-id: file:///svn/phpbb/trunk@5678 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index e0fb5e51f2..3e136e6dd4 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -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': |