mirror of
https://github.com/friendica/friendica
synced 2025-04-19 05:50:10 +00:00
Merge remote-tracking branch 'upstream/develop' into contact-media
This commit is contained in:
commit
a44d200c21
35 changed files with 702 additions and 433 deletions
|
@ -144,7 +144,7 @@ class Contact extends BaseModule
|
|||
|
||||
$info = Strings::escapeHtml(trim($_POST['info'] ?? ''));
|
||||
|
||||
$r = DBA::update('contact', [
|
||||
$r = Model\Contact::update([
|
||||
'priority' => $priority,
|
||||
'info' => $info,
|
||||
'hidden' => $hidden,
|
||||
|
@ -180,7 +180,7 @@ class Contact extends BaseModule
|
|||
$result = Model\Contact::createFromProbeForUser($contact['uid'], $contact['url'], $contact['network']);
|
||||
|
||||
if ($result['success']) {
|
||||
DBA::update('contact', ['subhub' => 1], ['id' => $contact_id]);
|
||||
Model\Contact::update(['subhub' => 1], ['id' => $contact_id]);
|
||||
}
|
||||
|
||||
// pull feed and consume it, which should subscribe to the hub.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue