From 21de871aff0392803dd98ab8a895fabac35f4219 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 21 Mar 2006 19:23:34 +0000
Subject: - a bunch of bugfixes. :P

git-svn-id: file:///svn/phpbb/trunk@5678 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes/functions.php')

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':
-- 
cgit v1.2.1