friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fewer Defaults

This commit is contained in:
Michael 2018-03-17 20:54:56 +00:00
parent 8700d2a8ad
commit c42c121e51
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Protocol/PortableContact.php
View File

@ -1302,7 +1302,7 @@ class PortableContact
if (isset($data->version)) {
$network = NETWORK_DFRN;
$noscrape = $data->no_scrape_url;
$noscrape = defaults($data->no_scrape_url, '');
$version = $data->version;
$site_name = $data->site_name;
$info = $data->info;
@ -1355,12 +1355,11 @@ class PortableContact
$info = strip_tags($info);
$platform = strip_tags($platform);
$fields = ['url' => $server_url, 'version' => defaults($version, ''),
'site_name' => defaults($site_name, ''), 'info' => defaults($info, ''),
'register_policy' => defaults($register_policy, 0), 'poco' => defaults($poco, ''),
'noscrape' => defaults($noscrape, ''), 'network' => defaults($network, ''),
'platform' => defaults($platform, ''), 'registered-users' => defaults($registered_users, 0),
'last_contact' => defaults($last_contact, ''), 'last_failure' => defaults($last_failure, '')];
$fields = ['url' => $server_url, 'version' => $version,
'site_name' => $site_name, 'info' => $info, 'register_policy' => $register_policy,
'poco' => $poco, 'noscrape' => $noscrape, 'network' => $network,
'platform' => $platform, 'registered-users' => $registered_users,
'last_contact' => $last_contact, 'last_failure' => $last_failure];
if ($found) {
dba::update('gserver', $fields, ['nurl' => normalise_link($server_url)]);