use omb_service_filter() rather than omb_match_service()
darcs-hash:20080602175936-84dde-d21c8236ef5ffd788edc81d9d7a932b2eae0ec7d.gz
This commit is contained in:
parent
326def1965
commit
3abe0290b7
|
@ -129,7 +129,7 @@ class RemotesubscribeAction extends Action {
|
||||||
|
|
||||||
# XXX: the following code could probably be refactored to eliminate dupes
|
# XXX: the following code could probably be refactored to eliminate dupes
|
||||||
|
|
||||||
$oauth_service = $xrds->services(omb_match_service(OAUTH_DISCOVERY));
|
$oauth_service = $xrds->services(omb_service_filter(OAUTH_DISCOVERY));
|
||||||
|
|
||||||
if (!$oauth_service) {
|
if (!$oauth_service) {
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -138,7 +138,7 @@ class RemotesubscribeAction extends Action {
|
||||||
$xrd = $this->getXRD($oauth_service, $xrds);
|
$xrd = $this->getXRD($oauth_service, $xrds);
|
||||||
$this->addServices($xrd, $oauth_endpoints, $omb);
|
$this->addServices($xrd, $oauth_endpoints, $omb);
|
||||||
|
|
||||||
$omb_service = $xrds->services(omb_match_service(OMB_NAMESPACE));
|
$omb_service = $xrds->services(omb_service_filter(OMB_NAMESPACE));
|
||||||
|
|
||||||
if (!$omb_service) {
|
if (!$omb_service) {
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -183,7 +183,7 @@ class RemotesubscribeAction extends Action {
|
||||||
|
|
||||||
function addServices($xrd, $types, &$omb) {
|
function addServices($xrd, $types, &$omb) {
|
||||||
foreach ($types as $type) {
|
foreach ($types as $type) {
|
||||||
$matches = $xrd->services(omb_match_service($type));
|
$matches = $xrd->services(omb_service_filter($type));
|
||||||
if ($matches) {
|
if ($matches) {
|
||||||
$omb[$type] = $services[0];
|
$omb[$type] = $services[0];
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user