2 files changed, 8 insertions, 8 deletions

diff --git a/include/activities.php b/include/activities.php
index e0717788a..1f595e57d 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_url'] . ']' . $self[0]['xchan_name'] . '[/url]';
+	$A = '[url=' . z_root() . '/profile/' . $self[0]['xchan_addr'] . ']' . $self[0]['xchan_name'] . '[/url]';
 
 
 	$changes = '';
@@ -42,7 +42,7 @@ function profile_activity($changed, $value) {
 		$changes .= $ch;
 	}
 
-	$prof = '[url=' . $self[0]['xchan_url'] . '?tab=profile' . ']' . t('public profile') . '[/url]';	
+	$prof = '[url=' . z_root() . '/profile/' . $self[0]['xchan_addr'] . ']' . t('public profile') . '[/url]';	
 
 	if($t == 1 && strlen($value)) {
 		$message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value);
@@ -55,14 +55,14 @@ function profile_activity($changed, $value) {
 	$arr['body'] = $message;  
 
 	$links = array();
-	$links[] = array('rel' => 'alternate', 'type' => 'text/html', 'href' => $self[0]['profile'] . '?tab=profile');
+	$links[] = array('rel' => 'alternate', 'type' => 'text/html', 'href' => z_root() . '/profile/' . $self[0]['xchan_addr']);
 	$links[] = array('rel' => 'photo', 'type' => $self[0]['xchan_photo_mimetype'], 'href' => $self[0]['xchan_photo_l']); 
 
 	$arr['object'] = json_encode(array(
-		'type' => ACTIVITY_OBJ_PROFILE,
+		'type'  => ACTIVITY_OBJ_PROFILE,
 		'title' => $self[0]['channel_name'],
-		'id' => $self[0]['xchan_url'] . '/' . $self[0]['xchan_hash'],
-		'link' => $links
+		'id'    => $self[0]['xchan_url'] . '/' . $self[0]['xchan_hash'],
+		'link'  => $links
 	));
 
 	
diff --git a/include/items.php b/include/items.php
index f640f1d2b..77c2c2aa2 100755
--- a/include/items.php
+++ b/include/items.php
@@ -447,8 +447,8 @@ function get_item_elements($j) {
 	$arr['location']   = (($j->location) ? htmlentities($j->location, ENT_COMPAT,'UTF-8') : '');
 	$arr['coord']      = (($j->coord)    ? htmlentities($j->coord,    ENT_COMPAT,'UTF-8') : '');
 	$arr['verb']       = (($j->verb)     ? htmlentities($j->verb,     ENT_COMPAT,'UTF-8') : '');
-	$arr['obj_type']    = (($j->objtype)  ? htmlentities($j->objtype,  ENT_COMPAT,'UTF-8') : '');
-	$arr['tgt_type']    = (($j->tgttype)  ? htmlentities($j->tgttype,  ENT_COMPAT,'UTF-8') : '');
+	$arr['obj_type']   = (($j->objtype)  ? htmlentities($j->objtype,  ENT_COMPAT,'UTF-8') : '');
+	$arr['tgt_type']   = (($j->tgttype)  ? htmlentities($j->tgttype,  ENT_COMPAT,'UTF-8') : '');
 
 	$arr['object']        = $j->object;
 	$arr['target']        = $j->target;