diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Contact.php | 4 | ||||
| -rw-r--r-- | include/ItemObject.php | 6 | ||||
| -rw-r--r-- | include/activities.php | 6 | ||||
| -rw-r--r-- | include/conversation.php | 6 | ||||
| -rw-r--r-- | include/identity.php | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/include/Contact.php b/include/Contact.php index f442f112c..c3600b9a3 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -238,9 +238,9 @@ function contact_photo_menu($contact) { function random_profile() { - $r = q("select xchan_profile from xchan where xchan_network = 'zot' order by rand() limit 1"); + $r = q("select xchan_url from xchan where xchan_network = 'zot' order by rand() limit 1"); if($r && count($r)) - return $r[0]['xchan_profile']; + return $r[0]['xchan_url']; return ''; } diff --git a/include/ItemObject.php b/include/ItemObject.php index b09cd470e..84f45054f 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -123,7 +123,7 @@ class Item extends BaseObject { $profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']); $profile_avatar = $item['author']['xchan_photo_m']; - $profile_link = zrl($item['author']['xchan_profile']); + $profile_link = zrl($item['author']['xchan_url']); $profile_name = $item['author']['xchan_name']; // if($item['author-link'] && (! $item['author-name'])) @@ -137,7 +137,7 @@ class Item extends BaseObject { else $profile_link = zrl($profile_link); - $profile_link = zrl($item['author']['xchan_profile']); + $profile_link = zrl($item['author']['xchan_url']); // $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']); @@ -520,7 +520,7 @@ class Item extends BaseObject { '$parent' => $this->get_id(), '$qcomment' => $qcomment, '$profile_uid' => $conv->get_profile_owner(), - '$mylink' => $this->observer['xchan_profile'], + '$mylink' => $this->observer['xchan_url'], '$mytitle' => t('This is you'), '$myphoto' => $this->observer['xchan_photo_s'], '$comment' => t('Comment'), diff --git a/include/activities.php b/include/activities.php index d9a39e2d8..e0717788a 100644 --- a/include/activities.php +++ b/include/activities.php @@ -25,7 +25,7 @@ function profile_activity($changed, $value) { $arr['verb'] = ACTIVITY_UPDATE; $arr['obj_type'] = ACTIVITY_OBJ_PROFILE; - $A = '[url=' . $self[0]['xchan_profile'] . ']' . $self[0]['xchan_name'] . '[/url]'; + $A = '[url=' . $self[0]['xchan_url'] . ']' . $self[0]['xchan_name'] . '[/url]'; $changes = ''; @@ -42,7 +42,7 @@ function profile_activity($changed, $value) { $changes .= $ch; } - $prof = '[url=' . $self[0]['xchan_profile'] . '?tab=profile' . ']' . t('public profile') . '[/url]'; + $prof = '[url=' . $self[0]['xchan_url'] . '?tab=profile' . ']' . t('public profile') . '[/url]'; if($t == 1 && strlen($value)) { $message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value); @@ -61,7 +61,7 @@ function profile_activity($changed, $value) { $arr['object'] = json_encode(array( 'type' => ACTIVITY_OBJ_PROFILE, 'title' => $self[0]['channel_name'], - 'id' => $self[0]['xchan_profile'] . '/' . $self[0]['xchan_hash'], + 'id' => $self[0]['xchan_url'] . '/' . $self[0]['xchan_hash'], 'link' => $links )); diff --git a/include/conversation.php b/include/conversation.php index 3c0a0831d..d9a5619a2 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -439,7 +439,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($thumb)); $profile_avatar = $item['author']['xchan_photo_m']; - $profile_link = zrl($item['author']['xchan_profile']); + $profile_link = zrl($item['author']['xchan_url']); $profile_name = $item['author']['xchan_name']; $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => ''); @@ -1232,7 +1232,7 @@ old code '$parent' => $item['parent'], '$qcomment' => $qcomment, '$profile_uid' => $profile_owner, - '$mylink' => $observer['xchan_profile'], + '$mylink' => $observer['xchan_url'], '$mytitle' => t('This is you'), '$myphoto' => $observer['xchan_photo_s'], '$comment' => t('Comment'), @@ -1321,7 +1321,7 @@ old code $profile_avatar = $item['author']['xchan_photo_m']; - $profile_link = zrl($item['author']['xchan_profile']); + $profile_link = zrl($item['author']['xchan_url']); $profile_name = $item['author']['xchan_name']; diff --git a/include/identity.php b/include/identity.php index 196ceece5..21cecaabc 100644 --- a/include/identity.php +++ b/include/identity.php @@ -110,7 +110,7 @@ function create_identity($arr) { $newuid = $ret['channel']['channel_id']; - $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_l, xchan_photo_m, xchan_photo_s, xchan_addr, xchan_profile, xchan_name, xchan_network, xchan_photo_date, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')", + $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_l, xchan_photo_m, xchan_photo_s, xchan_addr, xchan_url, xchan_name, xchan_network, xchan_photo_date, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')", dbesc($hash), dbesc($ret['channel']['channel_guid']), dbesc($sig), |