diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-21 11:12:56 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-21 11:12:56 -0800 |
| commit | 85528ccb1f5840a8c73f6c939f12d98bb3680cde (patch) | |
| tree | be0f09c02a2bf003c23d6be98919783347b9786d /actions/twitapisearchatom.php | |
| parent | 86f2f530ef60fdb601720885d493cf5b2a446e6b (diff) | |
| parent | 3e7a2a4014dd93637f5a666e238dde13e397523c (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/twitapisearchatom.php')
| -rw-r--r-- | actions/twitapisearchatom.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index baed2a0c7..e389ddec8 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -245,7 +245,7 @@ class TwitapisearchatomAction extends ApiAction 'xmlns:twitter' => 'http://api.twitter.com/', 'xml:lang' => 'en-US')); // XXX Other locales ? - $taguribase = common_config('integration', 'taguri'); + $taguribase = TagURI::base(); $this->element('id', null, "tag:$taguribase:search/$server"); $site_uri = common_path(false); @@ -329,7 +329,7 @@ class TwitapisearchatomAction extends ApiAction $this->elementStart('entry'); - $taguribase = common_config('integration', 'taguri'); + $taguribase = TagURI::base(); $this->element('id', null, "tag:$taguribase:$notice->id"); $this->element('published', null, common_date_w3dtf($notice->created)); |