clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reverted storing the protocol at all the time

This commit is contained in:
Michael 2019-05-05 10:36:51 +00:00
parent 2365193691
commit 0efab157c4
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Model/Contact.php
View File

@ -1344,7 +1344,6 @@ class Contact extends BaseObject
'location' => defaults($data, 'location', ''), 'location' => defaults($data, 'location', ''),
'about' => defaults($data, 'about', ''), 'about' => defaults($data, 'about', ''),
'network' => $data['network'], 'network' => $data['network'],
'protocol' => self::getProtocol($data['url'], $data['network']),
'pubkey' => defaults($data, 'pubkey', ''), 'pubkey' => defaults($data, 'pubkey', ''),
'rel' => self::SHARING, 'rel' => self::SHARING,
'priority' => defaults($data, 'priority', 0), 'priority' => defaults($data, 'priority', 0),
@ -1405,7 +1404,7 @@ class Contact extends BaseObject
self::updateAvatar($data['photo'], $uid, $contact_id); self::updateAvatar($data['photo'], $uid, $contact_id);
} }
$fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'pubkey', 'protocol']; $fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'pubkey'];
$contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]); $contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]);
// This condition should always be true // This condition should always be true
@ -1418,8 +1417,7 @@ class Contact extends BaseObject
'url' => $data['url'], 'url' => $data['url'],
'nurl' => Strings::normaliseLink($data['url']), 'nurl' => Strings::normaliseLink($data['url']),
'name' => $data['name'], 'name' => $data['name'],
'nick' => $data['nick'], 'nick' => $data['nick']];
'protocol' => self::getProtocol($data['url'], $data['network'])];
if (!empty($data['keywords'])) { if (!empty($data['keywords'])) {
$updated['keywords'] = $data['keywords']; $updated['keywords'] = $data['keywords'];
@ -2129,9 +2127,9 @@ class Contact extends BaseObject
return; return;
} }
// create contact record // create contact record
q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `protocol`, `rel`, q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`,
`blocked`, `readonly`, `pending`, `writable`) `blocked`, `readonly`, `pending`, `writable`)
VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1)", VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1)",
intval($importer['uid']), intval($importer['uid']),
DBA::escape(DateTimeFormat::utcNow()), DBA::escape(DateTimeFormat::utcNow()),
DBA::escape($url), DBA::escape($url),
@ -2140,7 +2138,6 @@ class Contact extends BaseObject
DBA::escape($nick), DBA::escape($nick),
DBA::escape($photo), DBA::escape($photo),
DBA::escape($network), DBA::escape($network),
DBA::escape($protocol),
intval(self::FOLLOWER) intval(self::FOLLOWER)
); );