summaryrefslogtreecommitdiff
path: root/plugins/OStatus/lib/discovery.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-09-02 22:56:18 -0400
committerEvan Prodromou <evan@status.net>2010-09-02 22:56:18 -0400
commit6c14235d6c3359a6c9012ec49077f8defe117779 (patch)
treea2c9abccb56d4c017a49ac27634d075dd54d57be /plugins/OStatus/lib/discovery.php
parent388495f6b1fe5de9af7fc6a01b12da1a5c36093e (diff)
parent1bfbe9badfbe3e79f82e7216d1401f05a2750677 (diff)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/OStatus/lib/discovery.php')
-rw-r--r--plugins/OStatus/lib/discovery.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/OStatus/lib/discovery.php b/plugins/OStatus/lib/discovery.php
index 7187c1f3e..ed22b452f 100644
--- a/plugins/OStatus/lib/discovery.php
+++ b/plugins/OStatus/lib/discovery.php
@@ -106,7 +106,8 @@ class Discovery
}
}
- throw new Exception('Unable to find services for '. $id);
+ // @todo Needs i18n.
+ throw new Exception('Unable to find services for '. $id '.');
}
public static function getService($links, $service) {
@@ -160,7 +161,7 @@ class Discovery_LRDD_Host_Meta implements Discovery_LRDD
} else {
$domain = parse_url($uri, PHP_URL_HOST);
}
-
+
$url = 'http://'. $domain .'/.well-known/host-meta';
$xrd = Discovery::fetchXrd($url);