diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-08-04 19:10:15 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-08-04 19:10:15 +0000 |
| commit | 5dcc0a85f845a214712d015199b11ebddff14437 (patch) | |
| tree | 100c725b1fd60687ccfa277a8582b6df27e360cd /phpBB/includes/session.php | |
| parent | 427cc1bf36f6a4a988b7ed53668266964a96746a (diff) | |
| download | forums-5dcc0a85f845a214712d015199b11ebddff14437.tar forums-5dcc0a85f845a214712d015199b11ebddff14437.tar.gz forums-5dcc0a85f845a214712d015199b11ebddff14437.tar.bz2 forums-5dcc0a85f845a214712d015199b11ebddff14437.tar.xz forums-5dcc0a85f845a214712d015199b11ebddff14437.zip | |
- 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
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 9 |
1 files changed, 8 insertions, 1 deletions
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) { |