diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-12 10:50:46 -0700 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-12 10:50:46 -0700 |
commit | 7d33478e867cc6610aded42a8f2fa71bae46804d (patch) | |
tree | 73a422fac7006ee40ff51c21922ca22f68cab40d /actions/shownotice.php | |
parent | 01dccefcccc8ca4c1fec419f47cf723d0498c3ef (diff) | |
parent | 853b6d38b362e3a905195d9ff850c9a884d412bd (diff) |
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
Diffstat (limited to 'actions/shownotice.php')
-rw-r--r-- | actions/shownotice.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/actions/shownotice.php b/actions/shownotice.php index 4b179bc72..8f2ffd6b9 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -278,16 +278,16 @@ class ShownoticeAction extends OwnerDesignAction $this->element('link',array('rel'=>'alternate', 'type'=>'application/json+oembed', 'href'=>common_local_url( - 'api', - array('apiaction'=>'oembed','method'=>'oembed.json'), - array('url'=>$this->notice->uri)), + 'oembed', + array(), + array('format'=>'json','url'=>$this->notice->uri)), 'title'=>'oEmbed'),null); $this->element('link',array('rel'=>'alternate', 'type'=>'text/xml+oembed', 'href'=>common_local_url( - 'api', - array('apiaction'=>'oembed','method'=>'oembed.xml'), - array('url'=>$this->notice->uri)), + 'oembed', + array(), + array('format'=>'xml','url'=>$this->notice->uri)), 'title'=>'oEmbed'),null); } } |