summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-04-12 21:41:20 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-04-12 21:41:20 +0000
commit6cfa587385c0ec47898d26dc8b850207ef3719a1 (patch)
tree8adff3c58febf71a34c1c69890e5cd6c29bd1574
parente9e7671d5fbb6e3e66c8629ac78246cd9a47ceda (diff)
parent4237407cd9ba7b44be81cb506eddc4671605802a (diff)
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
-rw-r--r--actions/publicxrds.php12
-rw-r--r--actions/tag.php5
2 files changed, 11 insertions, 6 deletions
diff --git a/actions/publicxrds.php b/actions/publicxrds.php
index aad59d779..2c52f1246 100644
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -51,7 +51,7 @@ class PublicxrdsAction extends Action
{
/**
* Is read only?
- *
+ *
* @return boolean true
*/
function isReadOnly()
@@ -61,7 +61,7 @@ class PublicxrdsAction extends Action
/**
* Class handler.
- *
+ *
* @param array $args array of arguments
*
* @return nothing
@@ -70,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) {
+ 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
diff --git a/actions/tag.php b/actions/tag.php
index d15f64498..c413bf8c3 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -86,4 +86,9 @@ class TagAction extends Action
$this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
$this->page, 'tag', array('tag' => $this->tag));
}
+
+ function isReadOnly()
+ {
+ return true;
+ }
}