3 files changed, 17 insertions, 14 deletions
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php
index e813254fbe..7bbd33a2a4 100644
--- a/phpBB/includes/page_header.php
+++ b/phpBB/includes/page_header.php
@@ -264,8 +264,8 @@ else
 //
 // Generate HTML required for Mozilla Navigation bar
 //
-/*
 $nav_links_html = '';
+/*
 $nav_link_proto = '<link rel="%s" href="%s" title="%s" />' . "\n";
 foreach ( $nav_links as $nav_item => $nav_array )
 {
@@ -295,7 +295,7 @@ $template->assign_vars(array(
 	'CURRENT_TIME' => sprintf($lang['Current_time'], $user->format_date(time())),
 	'TOTAL_USERS_ONLINE' => $l_online_users,
 	'LOGGED_IN_USER_LIST' => $online_userlist,
-	'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], $user->format_date($$board_config['record_online_date'])),
+	'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], $user->format_date($board_config['record_online_date'])),
 	'PRIVATE_MESSAGE_INFO' => $l_privmsgs_text,
 	'PRIVATE_MESSAGE_INFO_UNREAD' => $l_privmsgs_text_unread,
 	'PRIVATE_MESSAGE_NEW_FLAG' => $s_privmsg_new,
diff --git a/phpBB/includes/page_tail.php b/phpBB/includes/page_tail.php
index 6893641c6d..96360cb5e6 100644
--- a/phpBB/includes/page_tail.php
+++ b/phpBB/includes/page_tail.php
@@ -51,7 +51,7 @@ if (defined('DEBUG'))
 
 $template->assign_vars(array(
 	'PHPBB_VERSION' => $board_config['version'],
-	'ADMIN_LINK' => ( $auth->acl_get('a_') ) ? '<a href="' . "admin/index.$phpEx$SID" . '">' . $lang['Admin_panel'] . '</a><br /><br />' : '',
+	'ADMIN_LINK' => ( $auth->acl_get('a_') ) ? '<a href="' . "admin/index.$phpEx?sid=" . $userdata['session_id'] . '">' . $lang['Admin_panel'] . '</a><br /><br />' : '',
 	'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : ''
 ));
 
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 0712b4b902..9e8ea85e4c 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -40,7 +40,7 @@ class session {
 		{
 			$sessiondata = ( isset($_COOKIE[$board_config['cookie_name'] . '_data']) ) ? unserialize(stripslashes($_COOKIE[$board_config['cookie_name'] . '_data'])) : '';
 			$this->session_id = ( isset($_COOKIE[$board_config['cookie_name'] . '_sid']) ) ? $_COOKIE[$board_config['cookie_name'] . '_sid'] : '';
-			$SID = '?sid=';
+			$SID = (defined('IN_ADMIN')) ? '?sid=' . $this->session_id : '?sid=';
 		}
 		else
 		{
@@ -114,18 +114,21 @@ class session {
 		$sessiondata = array();
 		$current_time = time();
 
-		// Limit sessions in 1 minute period
-		$sql = "SELECT COUNT(*) AS sessions
-			FROM " . SESSIONS_TABLE . "
-			WHERE session_time >= " . ( $current_time - 60 );
-		$result = $db->sql_query($sql);
+		if ( intval($board_config['active_sessions']) )
+		{
+			// Limit sessions in 1 minute period
+			$sql = "SELECT COUNT(*) AS sessions
+				FROM " . SESSIONS_TABLE . "
+				WHERE session_time >= " . ( $current_time - 60 );
+			$result = $db->sql_query($sql);
 
-		$row = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
+			$row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
 
-		if ( intval($board_config['active_sessions']) && intval($row['sessions']) > intval($board_config['active_sessions']) )
-		{
-			message_die(MESSAGE, 'Board_unavailable');
+			if ( intval($row['sessions']) > intval($board_config['active_sessions']) )
+			{
+				message_die(MESSAGE, 'Board_unavailable');
+			}
 		}
 
 		// Garbage collection ... remove old sessions updating user information