diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-16 17:37:14 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-16 17:37:14 +0000 |
| commit | d353f4bdfc115aed9097249775298c79777d6157 (patch) | |
| tree | 154069337ca79acad3b357e7d2000a1a68459a4d /phpBB/includes/core/url.php | |
| parent | 5866ee91014116cb5c111ede4be29afe98054bb7 (diff) | |
| download | forums-d353f4bdfc115aed9097249775298c79777d6157.tar forums-d353f4bdfc115aed9097249775298c79777d6157.tar.gz forums-d353f4bdfc115aed9097249775298c79777d6157.tar.bz2 forums-d353f4bdfc115aed9097249775298c79777d6157.tar.xz forums-d353f4bdfc115aed9097249775298c79777d6157.zip | |
call user->page instead of grabbing it again and again
git-svn-id: file:///svn/phpbb/trunk@9267 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/core/url.php')
| -rw-r--r-- | phpBB/includes/core/url.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/core/url.php b/phpBB/includes/core/url.php index c073c48606..70315b4188 100644 --- a/phpBB/includes/core/url.php +++ b/phpBB/includes/core/url.php @@ -425,7 +425,7 @@ class phpbb_url extends phpbb_plugin_support $cookie_secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0; $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))) @@ -484,7 +484,7 @@ class phpbb_url extends phpbb_plugin_support if ($url_parts === false) { // 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'])) { @@ -515,9 +515,9 @@ class phpbb_url extends phpbb_plugin_support $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 { @@ -683,7 +683,7 @@ class phpbb_url extends phpbb_plugin_support public function build_url($strip_vars = false) { // 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... if (strpos($redirect, '?') === false) |