From e7c5f9e7de033098d9dcf58bb1cffda934dbd2c3 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 19 Jan 2011 14:19:40 -0800 Subject: undo sql change in f9f018ef083acb554003 (02-DEC-2010), not relevant and incorrect --- mod/display.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/display.php') diff --git a/mod/display.php b/mod/display.php index cad60d275..0e5768838 100644 --- a/mod/display.php +++ b/mod/display.php @@ -93,7 +93,7 @@ function display_content(&$a) { FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ) AND `type` != 'remote' ) + AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' )) $sql_extra ORDER BY `parent` DESC, `gravity` ASC, `id` ASC ", intval($a->profile['uid']), -- cgit v1.2.3 From 2ffe0d0b1d9589b6b37d8ade0114caef31339001 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 19 Jan 2011 19:51:34 -0800 Subject: do a better job of comparing same URLs. --- mod/display.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod/display.php') diff --git a/mod/display.php b/mod/display.php index 0e5768838..de11ec35d 100644 --- a/mod/display.php +++ b/mod/display.php @@ -202,7 +202,7 @@ function display_content(&$a) { $template = $wallwall; $commentww = 'ww'; // If it is our contact, use a friendly redirect link - if(($item['owner-link'] == $item['url']) && ($item['network'] === 'dfrn')) { + if((link_compare($item['owner-link'],$item['url'])) && ($item['network'] === 'dfrn')) { $owner_url = $redirect_url; $osparkle = ' sparkle'; } @@ -211,7 +211,7 @@ function display_content(&$a) { } } - $diff_author = (($item['url'] !== $item['author-link']) ? true : false); + $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true); $profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']); $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $item['thumb']); -- cgit v1.2.3