strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5031 from annando/fix-sql

Browse source 
Avoid SQL error with empty "bd" field
This commit is contained in:
Hypolite Petovan 2018-05-11 15:43:23 -04:00 committed by GitHub
parent d4e3f3f4bb 926c9719e0
commit ee143e32d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Protocol/Diaspora.php
View file

@ -2349,21 +2349,17 @@ class Diaspora
$birthday = $contact["bd"]; $birthday = $contact["bd"];
} }
$r = q( $fields = ['name' => $name, 'location' => $location,
"UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `name-date` = '%s', `bd` = '%s', 'name-date' => DateTimeFormat::utcNow(),
`location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `id` = %d AND `uid` = %d", 'about' => $about, 'gender' => $gender,
dbesc($name), 'addr' => $author, 'nick' => $nick,
dbesc($nick), 'keywords' => $keywords];
dbesc($author),
dbesc(DateTimeFormat::utcNow()), if (!empty($birthday)) {
dbesc($birthday), $fields['bd'] = $birthday;
dbesc($location), }
dbesc($about),
dbesc($keywords), dba::update('contact', $fields, ['id' => $contact['id']]);
dbesc($gender),
intval($contact["id"]),
intval($importer["uid"])
);
$gcontact = ["url" => $contact["url"], "network" => NETWORK_DIASPORA, "generation" => 2, $gcontact = ["url" => $contact["url"], "network" => NETWORK_DIASPORA, "generation" => 2,
"photo" => $image_url, "name" => $name, "location" => $location, "photo" => $image_url, "name" => $name, "location" => $location,