From 631354733a772e99768cef66bfc2e6a191f1a87d Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 1 Feb 2009 16:45:53 +0000
Subject: [PATCH] - Patch #366949 by c960657: use parse_url(, PHP_URL_xxx).

---
 includes/language.inc        | 4 ++--
 modules/openid/openid.module | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/language.inc b/includes/language.inc
index 6da93966ee2..9a990a72230 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 c5dcb327159..bc278abbce7 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));