diff options
author | Dries Buytaert <dries@buytaert.net> | 2009-08-21 17:07:17 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2009-08-21 17:07:17 +0000 |
commit | 0d9816b8fd1eb1982cfda4ec11f566aab09571ac (patch) | |
tree | 1b726d2c8744a95291a9e336bd6d01433471f517 /includes/browser.inc | |
parent | 19638ba0c60bc9bdd147a232c0a237fc371613a5 (diff) | |
download | brdo-0d9816b8fd1eb1982cfda4ec11f566aab09571ac.tar.gz brdo-0d9816b8fd1eb1982cfda4ec11f566aab09571ac.tar.bz2 |
- Patch #555400 by boombatower: remove duplicate method.
Diffstat (limited to 'includes/browser.inc')
-rw-r--r-- | includes/browser.inc | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/includes/browser.inc b/includes/browser.inc index 43bf7f206..a6c4219d2 100644 --- a/includes/browser.inc +++ b/includes/browser.inc @@ -288,7 +288,7 @@ class Browser { // Clear the page variable since the content has change. unset($this->page); - $this->checkForRefresh(); + $this->refreshCheck(); } /** @@ -781,29 +781,7 @@ class Browser { * A refresh signifier can either be the 'Location' HTTP header or the meta * tag 'http-equiv="Refresh"'. */ - function refreshCheck() { - // If not handled by backend wrapper then go ahead and handle. - if (isset($this->headers['Location'])) { - // Expect absolute URL. - $this->get($this->headers['Location']); - } - - if (($page = $this->getPage()) !== FALSE && ($tag = $page->getMetaTag('Refresh', 'http-equiv'))) { - // Parse the content attribute of the meta tag for the format: - // "[delay]: URL=[path_to_redirect_to]". - if (preg_match('/\d+;\s*URL=(?P<url>.*)/i', $tag['content'], $match)) { - $this->get($page->getAbsoluteUrl(decode_entities($match['url']))); - } - } - } - - /** - * Check for a refresh signifier. - * - * A refresh signifier can either be the 'Location' HTTP header or the meta - * tag 'http-equiv="Refresh"'. - */ - protected function checkForRefresh() { + protected function refreshCheck() { // If not handled by backend wrapper then go ahead and handle. if (isset($this->headers['Location'])) { // Expect absolute URL. |