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

Merge pull request #2168 from annando/1512-contact-posts 

Bugfix: Posts weren't always shown for feeds that start with "www."
This commit is contained in:
Tobias Diekershoff 2015-12-11 08:11:16 +01:00
parent 5f27f509cb 300007a0cf
commit f304ba74fb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/contacts.php
View File

@ -903,7 +903,7 @@ function contact_posts($a, $contact_id) {
$r = q("SELECT COUNT(*) AS `total` FROM `item` $r = q("SELECT COUNT(*) AS `total` FROM `item`
WHERE `item`.`uid` = %d AND `author-link` IN ('%s', '%s')", WHERE `item`.`uid` = %d AND `author-link` IN ('%s', '%s')",
intval(local_user()), intval(local_user()),
dbesc(normalise_link($contact["url"])), dbesc(str_replace("https://", "http://", $contact["url"])),
dbesc(str_replace("http://", "https://", $contact["url"]))); dbesc(str_replace("http://", "https://", $contact["url"])));
$a->set_pager_total($r[0]['total']); $a->set_pager_total($r[0]['total']);
@ -918,7 +918,7 @@ function contact_posts($a, $contact_id) {
ORDER BY `item`.`created` DESC LIMIT %d, %d", ORDER BY `item`.`created` DESC LIMIT %d, %d",
intval(local_user()), intval(local_user()),
intval($contact_id), intval($contact_id),
dbesc(normalise_link($contact["url"])), dbesc(str_replace("https://", "http://", $contact["url"])),
dbesc(str_replace("http://", "https://", $contact["url"])), dbesc(str_replace("http://", "https://", $contact["url"])),
intval($a->pager['start']), intval($a->pager['start']),
intval($a->pager['itemspage']) intval($a->pager['itemspage'])