Merge branch 'no-term3' into no-term2
This commit is contained in:
commit
3d4ace7a9d
6 changed files with 13 additions and 80 deletions
|
@ -847,7 +847,7 @@ class Contact
|
|||
$item['body'] = '';
|
||||
$item['title'] = '';
|
||||
$item['guid'] = '';
|
||||
$item['tag'] = '';
|
||||
$item['uri-id'] = 0;
|
||||
$item['attach'] = '';
|
||||
$slap = OStatus::salmon($item, $user);
|
||||
|
||||
|
@ -2457,7 +2457,7 @@ class Contact
|
|||
$item['body'] = '';
|
||||
$item['title'] = '';
|
||||
$item['guid'] = '';
|
||||
$item['tag'] = '';
|
||||
$item['uri-id'] = 0;
|
||||
$item['attach'] = '';
|
||||
|
||||
$slap = OStatus::salmon($item, $owner);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue