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

Some precaution to avoid overwriting of existing data with blanks

Browse Source
This commit is contained in:
Michael Vogel
2015-07-12 11:19:40 +02:00
parent fe137a92ef
commit 0ac75deee1
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/follow.php
+11 -1
View File
@@ -1,7 +1,12 @@
<?php
function update_contact($id) {
$r = q("SELECT `url`, `network` FROM `contact` WHERE `id` = %d", intval($id));
/*
Warning: Never ever fetch the public key via probe_url and write it into the contacts.
This will reliably kill your communication with Friendica contacts.
*/
$r = q("SELECT `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `network` FROM `contact` WHERE `id` = %d", intval($id));
if (!$r)
return;
@@ -11,6 +16,11 @@ function update_contact($id) {
if ($ret["network"] != $r[0]["network"])
return;
// make sure to not overwrite existing values with blank entries
foreach ($ret AS $key => $val)
if (isset($r[0][$key]) AND ($r[0][$key] != "") AND ($val == ""))
$ret[$key] = $r[0][$key];
q("UPDATE `contact` SET `url` = '%s', `nurl` = '%s', `addr` = '%s', `alias` = '%s', `batch` = '%s', `notify` = '%s', `poll` = '%s', `poco` = '%s', `name` = '%s', `nick` = '%s' WHERE `id` = %d",
dbesc($ret['url']),
dbesc(normalise_link($ret['url'])),