Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 17:10:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some more warnings removed

Browse source
This commit is contained in:
Michael 2019-10-31 07:33:25 +00:00
parent 9033a94873
commit 44cc750f79
3 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Protocol/Diaspora.php
View file

@ -176,7 +176,7 @@ class Diaspora
* @return array with the contact
* @throws \Exception
*/
private static function getRelayContact(string $server_url, array $fields = ['batch', 'id', 'name', 'network', 'protocol', 'archive', 'blocked'])
private static function getRelayContact(string $server_url, array $fields = ['batch', 'id', 'url', 'name', 'network', 'protocol', 'archive', 'blocked'])
{
// Fetch the relay contact
$condition = ['uid' => 0, 'nurl' => Strings::normaliseLink($server_url),
@ -250,7 +250,7 @@ class Diaspora
*/
public static function participantsForThread($thread, array $contacts)
{
$r = DBA::p("SELECT `contact`.`batch`, `contact`.`id`, `contact`.`name`, `contact`.`network`, `contact`.`protocol`,
$r = DBA::p("SELECT `contact`.`batch`, `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`network`, `contact`.`protocol`,
`fcontact`.`batch` AS `fbatch`, `fcontact`.`network` AS `fnetwork` FROM `participation`
INNER JOIN `contact` ON `contact`.`id` = `participation`.`cid`
INNER JOIN `fcontact` ON `fcontact`.`id` = `participation`.`fid`