summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEric Helgeson <helfire@Erics-MBP.local>2009-03-09 20:01:35 -0500
committerEric Helgeson <helfire@Erics-MBP.local>2009-03-09 20:01:35 -0500
commitc6cd87c106b763ed5610dae64e5a02ba86609ece (patch)
tree2f93e5b2f7183fee0c6fcebce9de93033f930ae2 /actions
parent945bbf00dc9ee106359e9387956c72c1290d12fc (diff)
Changed all $config[][] calls to common_config()
Diffstat (limited to 'actions')
-rw-r--r--actions/finishopenidlogin.php3
-rw-r--r--actions/noticesearchrss.php3
-rw-r--r--actions/publicrss.php5
-rw-r--r--actions/remotesubscribe.php4
4 files changed, 5 insertions, 10 deletions
diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index 6d92cb9aa..52d9be29c 100644
--- a/actions/finishopenidlogin.php
+++ b/actions/finishopenidlogin.php
@@ -62,9 +62,8 @@ class FinishopenidloginAction extends Action
if ($this->error) {
$this->element('div', array('class' => 'error'), $this->error);
} else {
- global $config;
$this->element('div', 'instructions',
- sprintf(_('This is the first time you\'ve logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one.'), $config['site']['name']));
+ sprintf(_('This is the first time you\'ve logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one.'), common_config('site', 'name')));
}
}
diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php
index 7172977ee..0f98ed04b 100644
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -82,10 +82,9 @@ class NoticesearchrssAction extends Rss10Action
function getChannel()
{
- global $config;
$q = $this->trimmed('q');
$c = array('url' => common_local_url('noticesearchrss', array('q' => $q)),
- 'title' => $config['site']['name'] . sprintf(_(' Search Stream for "%s"'), $q),
+ 'title' => common_config('site', 'name') . sprintf(_(' Search Stream for "%s"'), $q),
'link' => common_local_url('noticesearch', array('q' => $q)),
'description' => sprintf(_('All updates matching search term "%s"'), $q));
return $c;
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;
}
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index a2e01bd3a..af130f425 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -333,8 +333,6 @@ class RemotesubscribeAction extends Action
function requestAuthorization($user, $omb, $token, $secret)
{
- global $config; # for license URL
-
$con = omb_oauth_consumer();
$tok = new OAuthToken($token, $secret);
@@ -358,7 +356,7 @@ class RemotesubscribeAction extends Action
$req->set_parameter('omb_listenee', $user->uri);
$req->set_parameter('omb_listenee_profile', common_profile_url($user->nickname));
$req->set_parameter('omb_listenee_nickname', $user->nickname);
- $req->set_parameter('omb_listenee_license', $config['license']['url']);
+ $req->set_parameter('omb_listenee_license', common_config('license', 'url'));
$profile = $user->getProfile();
if (!$profile) {