From 5dcc0a85f845a214712d015199b11ebddff14437 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 4 Aug 2004 19:10:15 +0000
Subject: - fixing some issues with the confirm screen - merging our (the devs)
 approaches (more fail-safe now) - fixing some small issues...

git-svn-id: file:///svn/phpbb/trunk@4957 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/session.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 8b511c6e17..2fbfa153c3 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -34,6 +34,12 @@ class session
 		$split_page = array();
 		preg_match_all('#^.*?([a-z]+?)\.' . $phpEx . '\?sid=[a-z0-9]*?(&.*)?$#i', $this->page, $split_page, PREG_SET_ORDER);
 
+		// Take care of SID
+		if (!isset($split_page[0][1]))
+		{
+			$split_page[0][1] = substr(strrchr($this->page, '/'), 1);
+		}
+
 		// Page for session_page value
 		$this->page = $split_page[0][1] . ((isset($split_page[0][2])) ? $split_page[0][2] : '');
 		$this->page .= (isset($_POST['f'])) ? 'f=' . intval($_POST['f']) : '';
@@ -784,7 +790,8 @@ class user extends session
 
 	function img($img, $alt = '', $width = false, $suffix = '')
 	{
-		static $imgs, $phpbb_root_path;
+		static $imgs;
+		global $phpbb_root_path;
 
 		if (empty($imgs[$img . $suffix]) || $width)
 		{
-- 
cgit v1.2.1