Merge branch '0.9.x' into 1.0.x
Conflicts: actions/imsettings.php lib/jabber.php Made a quick attempt to merge the new JID validation into the XmppPlugin, have not had a chance to test that version live yet. Should also move over the test cases.
This commit is contained in:
@@ -520,8 +520,8 @@ class User extends Memcached_DataObject
|
||||
common_log(LOG_WARNING,
|
||||
sprintf(
|
||||
"Profile ID %d (%s) tried to block his or herself.",
|
||||
$profile->id,
|
||||
$profile->nickname
|
||||
$this->id,
|
||||
$this->nickname
|
||||
)
|
||||
);
|
||||
return false;
|
||||
@@ -543,13 +543,7 @@ class User extends Memcached_DataObject
|
||||
return false;
|
||||
}
|
||||
|
||||
// Cancel their subscription, if it exists
|
||||
|
||||
$otherUser = User::staticGet('id', $other->id);
|
||||
|
||||
if (!empty($otherUser)) {
|
||||
subs_unsubscribe_to($otherUser, $this->getProfile());
|
||||
}
|
||||
Subscription::cancel($other, $this->getProfile());
|
||||
|
||||
$block->query('COMMIT');
|
||||
|
||||
|
Reference in New Issue
Block a user