forked from GNUsocial/gnu-social
pass profile id for subscriptions rather than user name
darcs-hash:20081208031312-5ed1f-b570b86b28e8eda763c51be1ae091034f76bd984.gz
This commit is contained in:
parent
81a81baf83
commit
fd6df5402e
@ -45,9 +45,16 @@ class SubscribeAction extends Action {
|
||||
return;
|
||||
}
|
||||
|
||||
$other_nickname = $this->arg('subscribeto');
|
||||
$other_id = $this->arg('subscribeto');
|
||||
|
||||
$result=subs_subscribe_user($user, $other_nickname);
|
||||
$other = User::staticGet('id', $other_id);
|
||||
|
||||
if (!$other) {
|
||||
$this->client_error(_('Not a local user.'));
|
||||
return;
|
||||
}
|
||||
|
||||
$result = subs_subscribe_to($user, $other);
|
||||
|
||||
if($result != true) {
|
||||
common_user_error($result);
|
||||
|
@ -2050,15 +2050,15 @@ function common_nudge_response() {
|
||||
}
|
||||
|
||||
function common_subscribe_form($profile) {
|
||||
common_element_start('form', array('id' => 'subscribe-' . $profile->nickname,
|
||||
common_element_start('form', array('id' => 'subscribe-' . $profile->id,
|
||||
'method' => 'post',
|
||||
'class' => 'subscribe',
|
||||
'action' => common_local_url('subscribe')));
|
||||
common_hidden('token', common_session_token());
|
||||
common_element('input', array('id' => 'subscribeto-' . $profile->nickname,
|
||||
common_element('input', array('id' => 'subscribeto-' . $profile->id,
|
||||
'name' => 'subscribeto',
|
||||
'type' => 'hidden',
|
||||
'value' => $profile->nickname));
|
||||
'value' => $profile->id));
|
||||
common_element('input', array('type' => 'submit',
|
||||
'class' => 'submit',
|
||||
'value' => _('Subscribe')));
|
||||
|
Loading…
Reference in New Issue
Block a user