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

Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import

This commit is contained in:
Michael Vogel 2016-01-27 13:16:28 +01:00
parent afed5f3afc d6c1889a20
commit aeecd83ade
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/contacts.php
View File

@ -903,7 +903,10 @@ function contact_posts($a, $contact_id) {
$o .= $tab_str;
if ($contact["url"]) {
$r = q("SELECT `id` FROM `item` WHERE `contact-id` = %d LIMIT 1", intval($contact_id));
if ($r)
$o .= posts_from_contact($a, $contact_id);
elseif ($contact["url"]) {
$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
dbesc(normalise_link($contact["url"])));