diff options
| author | root <root@diekershoff.homeunix.net> | 2011-01-20 08:17:07 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2011-01-20 08:17:07 +0100 |
| commit | 030f6f306cba0f025d124fc7a2912a2bafb291be (patch) | |
| tree | 7643c61b5d25671b3d79ba2d8c28fd7c9bb60b4a /mod/display.php | |
| parent | 8e22c669a0668fc0498e9c1d822dcefd97bae1e5 (diff) | |
| parent | 2ffe0d0b1d9589b6b37d8ade0114caef31339001 (diff) | |
| download | volse-hubzilla-030f6f306cba0f025d124fc7a2912a2bafb291be.tar.gz volse-hubzilla-030f6f306cba0f025d124fc7a2912a2bafb291be.tar.bz2 volse-hubzilla-030f6f306cba0f025d124fc7a2912a2bafb291be.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/display.php')
| -rw-r--r-- | mod/display.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/display.php b/mod/display.php index cad60d275..de11ec35d 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']), @@ -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']); |