Browse Source

Fix default value of contact parameter of OStatus::import in mod/salmon

pull/6487/head
Hypolite Petovan 2 years ago
parent
commit
0cc1a07cfa
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      mod/salmon.php
  2. +2
    -2
      src/Protocol/OStatus.php

+ 1
- 1
mod/salmon.php View File

@ -184,7 +184,7 @@ function salmon_post(App $a, $xml = '') {
// Placeholder for hub discovery.
$hub = '';
$contact_rec = ((DBA::isResult($r)) ? $r[0] : null);
$contact_rec = ((DBA::isResult($r)) ? $r[0] : []);
OStatus::import($data, $importer, $contact_rec, $hub);


+ 2
- 2
src/Protocol/OStatus.php View File

@ -74,7 +74,7 @@ class OStatus
$author["contact-id"] = $contact["id"];
$contact = null;
$contact = [];
/*
This here would be better, but we would get problems with contacts from the statusnet addon
@ -231,7 +231,7 @@ class OStatus
GContact::link($gcid, $contact["uid"], $contact["id"]);
} elseif ($contact["network"] != Protocol::DFRN) {
$contact = null;
$contact = [];
}
return $author;


Loading…
Cancel
Save