Merge branch '0.7.x' into 0.8.x

[quix0rs-gnu-social.git] / actions / publicxrds.php

diff --git a/actions/publicxrds.php b/actions/publicxrds.php
index a0f54e667f4f00ac17542c4fb2d3c0679ed67d11..283a932ca56772b4191a5bc6a5fa7e2c5618085c 100644 (file)
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -49,20 +49,19 @@ require_once INSTALLDIR.'/lib/openid.php';
  */
 class PublicxrdsAction extends Action
 {
-
     /**
      * Is read only?
-     * 
+     *
      * @return boolean true
      */
-    function isReadOnly()
+    function isReadOnly($args)
     {
         return true;
     }
 
     /**
      * Class handler.
-     * 
+     *
      * @param array $args array of arguments
      *
      * @return nothing
@@ -71,24 +70,24 @@ class PublicxrdsAction extends Action
     {
         parent::handle($args);
         header('Content-Type: application/xrds+xml');
-        common_start_xml();
+        $this->startXML();
         $this->elementStart('XRDS', array('xmlns' => 'xri://$xrds'));
         $this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
                                           'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
                                           'version' => '2.0'));
         $this->element('Type', null, 'xri://$xrds*simple');
-        foreach (array('finishopenidlogin', 'finishaddopenid', 'finishimmediate') as $finish) {
-            $this->show_service(Auth_OpenID_RP_RETURN_TO_URL_TYPE,
+        foreach (array('finishopenidlogin', 'finishaddopenid') as $finish) {
+            $this->showService(Auth_OpenID_RP_RETURN_TO_URL_TYPE,
                                 common_local_url($finish));
         }
         $this->elementEnd('XRD');
         $this->elementEnd('XRDS');
-        common_end_xml();
+        $this->endXML();
     }
 
     /**
      * Show service.
-     * 
+     *
      * @param string $type    XRDS type
      * @param string $uri     URI
      * @param array  $params  type parameters, null by default