Reworked fetching of contact data on "display" page

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 94e3c0a37f0b4460a3cad33a4ef78f7b32229c19..608971d08d38dd1dce47516b4d1ca2ae5dbd6d88 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -181,7 +181,7 @@ function profile_content(&$a, $update = 0) {
                $commpage = (($a->profile['page-flags'] == PAGE_COMMUNITY) ? true : false);
                $commvisitor = (($commpage && $remote_contact == true) ? true : false);
 
-               $a->page['aside'] .= posted_date_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true); 
+               $a->page['aside'] .= posted_date_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true);
                $a->page['aside'] .= categories_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
 
                if(can_write_wall($a,$a->profile['profile_uid'])) {
@@ -191,8 +191,8 @@ function profile_content(&$a, $update = 0) {
                                'allow_location' => ((($is_owner || $commvisitor) && $a->profile['allow_location']) ? true : false),
                                'default_location' => (($is_owner) ? $a->user['default-location'] : ''),
                                'nickname' => $a->profile['nickname'],
-                               'lockstate' => (((is_array($a->user) && ((strlen($a->user['allow_cid'])) || 
-                                               (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || 
+                               'lockstate' => (((is_array($a->user) && ((strlen($a->user['allow_cid'])) ||
+                                               (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) ||
                                                (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
                                'acl' => (($is_owner) ? populate_acl($a->user, true) : ''),
                                'bang' => '',
@@ -302,9 +302,9 @@ function profile_content(&$a, $update = 0) {
                foreach($r as $rr)
                        $parents_arr[] = $rr['item_id'];
                $parents_str = implode(', ', $parents_arr);
- 
+
                $items = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
-                       `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`, 
+                       `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`,
                        `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
                        `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
                        FROM `item`, `contact`