summaryrefslogtreecommitdiff
path: root/actions/remotesubscribe.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/remotesubscribe.php
parentbab3e1b8586f42bc1f0a5f96b6990d67c6b74446 (diff)
parentb3a0eea3b66e95becb6c4595ed71c7fe71ed6437 (diff)
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
Diffstat (limited to 'actions/remotesubscribe.php')
-rw-r--r--actions/remotesubscribe.php12
1 files changed, 5 insertions, 7 deletions
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 7ea7acd6d..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) {
@@ -367,16 +365,16 @@ class RemotesubscribeAction extends Action
return;
}
- if ($profile->fullname) {
+ if (!is_null($profile->fullname)) {
$req->set_parameter('omb_listenee_fullname', $profile->fullname);
}
- if ($profile->homepage) {
+ if (!is_null($profile->homepage)) {
$req->set_parameter('omb_listenee_homepage', $profile->homepage);
}
- if ($profile->bio) {
+ if (!is_null($profile->bio)) {
$req->set_parameter('omb_listenee_bio', $profile->bio);
}
- if ($profile->location) {
+ if (!is_null($profile->location)) {
$req->set_parameter('omb_listenee_location', $profile->location);
}
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);