summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-04 13:04:31 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-08-04 13:04:31 -0400
commit2ed46ce274c3b404fdf75aacafa5d5fa7a807240 (patch)
treefcaae42bdb8d69a1e8028bd9294dd376759852f0
parent628a9371082531908a023618ad4216a2f254f481 (diff)
move XRDS code from public action to OpenIDPlugin
-rw-r--r--actions/public.php18
-rw-r--r--plugins/OpenID/OpenIDPlugin.php14
2 files changed, 14 insertions, 18 deletions
diff --git a/actions/public.php b/actions/public.php
index d0317ac70..322a52963 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -101,8 +101,6 @@ class PublicAction extends Action
{
parent::handle($args);
- header('X-XRDS-Location: '. common_local_url('publicxrds'));
-
$this->showPage();
}
@@ -144,22 +142,6 @@ class PublicAction extends Action
}
/**
- * Extra head elements
- *
- * We include a <meta> element linking to the publicxrds page, for OpenID
- * client-side authentication.
- *
- * @return void
- */
-
- function extraHead()
- {
- // for client side of OpenID authentication
- $this->element('meta', array('http-equiv' => 'X-XRDS-Location',
- 'content' => common_local_url('publicxrds')));
- }
-
- /**
* Show tabset for this page
*
* Uses the PublicGroupNav widget
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index fb6bc5cf8..a395f9107 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -142,4 +142,18 @@ class OpenIDPlugin extends Plugin
return true;
}
}
+
+ /**
+ * We include a <meta> element linking to the publicxrds page, for OpenID
+ * client-side authentication.
+ *
+ * @return void
+ */
+
+ function onEndHeadChildren($action)
+ {
+ // for client side of OpenID authentication
+ $action->element('meta', array('http-equiv' => 'X-XRDS-Location',
+ 'content' => common_local_url('publicxrds')));
+ }
}