diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-02-01 16:45:53 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-02-01 16:45:53 +0000 |
| commit | 631354733a772e99768cef66bfc2e6a191f1a87d (patch) | |
| tree | 3b308de0a88b11f2be0b3b931a91ca8dfcf172f3 | |
| parent | b8389ebd54e908131542576c0ce4ea8971768733 (diff) | |
| download | brdo-631354733a772e99768cef66bfc2e6a191f1a87d.tar.gz brdo-631354733a772e99768cef66bfc2e6a191f1a87d.tar.bz2 | |
- Patch #366949 by c960657: use parse_url(, PHP_URL_xxx).
| -rw-r--r-- | includes/language.inc | 4 | ||||
| -rw-r--r-- | modules/openid/openid.module | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/includes/language.inc b/includes/language.inc index 6da93966e..9a990a722 100644 --- a/includes/language.inc +++ b/includes/language.inc @@ -24,8 +24,8 @@ function language_initialize() { case LANGUAGE_NEGOTIATION_DOMAIN: foreach ($languages as $language) { - $parts = parse_url($language->domain); - if (!empty($parts['host']) && ($_SERVER['HTTP_HOST'] == $parts['host'])) { + $host = parse_url($language->domain, PHP_URL_HOST); + if ($host && ($_SERVER['HTTP_HOST'] == $host)) { return $language; } } diff --git a/modules/openid/openid.module b/modules/openid/openid.module index c5dcb3271..bc278abbc 100644 --- a/modules/openid/openid.module +++ b/modules/openid/openid.module @@ -285,8 +285,8 @@ function openid_discovery($claimed_id) { if (_openid_is_xri($claimed_id)) { $xrds_url = 'http://xri.net/' . $claimed_id; } - $url = @parse_url($xrds_url); - if ($url['scheme'] == 'http' || $url['scheme'] == 'https') { + $scheme = @parse_url($xrds_url, PHP_URL_SCHEME); + if ($scheme == 'http' || $scheme == 'https') { // For regular URLs, try Yadis resolution first, then HTML-based discovery $headers = array('Accept' => 'application/xrds+xml'); $result = drupal_http_request($xrds_url, array('headers' => $headers)); |