summaryrefslogtreecommitdiff
path: root/actions/publicrss.php
diff options
context:
space:
mode:
authorFederico Marani <federico.marani@ymail.com>2009-03-16 22:43:51 +0000
committerFederico Marani <federico.marani@ymail.com>2009-03-16 22:43:51 +0000
commit420c3613049bec1360cdeb1f50283b239adf23d3 (patch)
tree0ab458b3c45c883232b3ed31addbc2aba1288f6a /actions/publicrss.php
parentbab3e1b8586f42bc1f0a5f96b6990d67c6b74446 (diff)
parentb3a0eea3b66e95becb6c4595ed71c7fe71ed6437 (diff)
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
Diffstat (limited to 'actions/publicrss.php')
-rw-r--r--actions/publicrss.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/actions/publicrss.php b/actions/publicrss.php
index c35877997..77e26e0f4 100644
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -84,12 +84,11 @@ class PublicrssAction extends Rss10Action
*/
function getChannel()
{
- global $config;
$c = array(
'url' => common_local_url('publicrss')
- , 'title' => sprintf(_('%s Public Stream'), $config['site']['name'])
+ , 'title' => sprintf(_('%s Public Stream'), common_config('site', 'name'))
, 'link' => common_local_url('public')
- , 'description' => sprintf(_('All updates for %s'), $config['site']['name']));
+ , 'description' => sprintf(_('All updates for %s'), common_config('site', 'name')));
return $c;
}