makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 19:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

call user->page instead of grabbing it again and again

Browse source 
git-svn-id: file:///svn/phpbb/trunk@9267 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-01-16 17:37:14 +00:00
parent 5866ee9101
commit d353f4bdfc
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/core/url.php
View file

@ -425,7 +425,7 @@ class phpbb_url extends phpbb_plugin_support
$cookie_secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0; $cookie_secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0;
$url = (($cookie_secure) ? 'https://' : 'http://') . $server_name; $url = (($cookie_secure) ? 'https://' : 'http://') . $server_name;
$script_path = phpbb::$user->system['page']['root_script_path']; $script_path = phpbb::$user->page['root_script_path'];
} }
if ($server_port && (($cookie_secure && $server_port <> 443) || (!$cookie_secure && $server_port <> 80))) if ($server_port && (($cookie_secure && $server_port <> 443) || (!$cookie_secure && $server_port <> 80)))
@ -484,7 +484,7 @@ class phpbb_url extends phpbb_plugin_support
if ($url_parts === false) if ($url_parts === false)
{ {
// Malformed url, redirect to current page... // Malformed url, redirect to current page...
$url = $this->generate_board_url() . '/' . phpbb::$user->system['page']['page']; $url = $this->generate_board_url() . '/' . phpbb::$user->page['page'];
} }
else if (!empty($url_parts['scheme']) && !empty($url_parts['host'])) else if (!empty($url_parts['scheme']) && !empty($url_parts['host']))
{ {
@ -515,9 +515,9 @@ class phpbb_url extends phpbb_plugin_support
$url = substr($url, 1); $url = substr($url, 1);
} }
if (phpbb::$user->system['page']['page_dir']) if (phpbb::$user->page['page_dir'])
{ {
$url = $this->generate_board_url() . '/' . phpbb::$user->system['page']['page_dir'] . '/' . $url; $url = $this->generate_board_url() . '/' . phpbb::$user->page['page_dir'] . '/' . $url;
} }
else else
{ {
@ -683,7 +683,7 @@ class phpbb_url extends phpbb_plugin_support
public function build_url($strip_vars = false) public function build_url($strip_vars = false)
{ {
// Append SID // Append SID
$redirect = $this->append_sid(phpbb::$user->system['page']['page'], false, false); $redirect = $this->append_sid(phpbb::$user->page['page'], false, false);
// Add delimiter if not there... // Add delimiter if not there...
if (strpos($redirect, '?') === false) if (strpos($redirect, '?') === false)