mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 14:00:31 +02:00
- 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
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
Reference in New Issue
Block a user