Merge remote-tracking branch 'upstream/develop' into 1702-null-date

This commit is contained in:
Michael 2017-03-19 08:06:02 +00:00
commit b06d787130

View file

@ -903,10 +903,10 @@ function contact_block() {
intval($shown) intval($shown)
); );
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
$contacts = ""; $contacts = array();
foreach ($r AS $contact) foreach ($r AS $contact) {
$contacts[] = $contact["id"]; $contacts[] = $contact["id"];
}
$r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `thumb`, `network` FROM `contact` WHERE `id` IN (%s)", $r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `thumb`, `network` FROM `contact` WHERE `id` IN (%s)",
dbesc(implode(",", $contacts))); dbesc(implode(",", $contacts)));