aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/auth.php1
-rw-r--r--include/nav.php2
-rw-r--r--include/notifier.php6
3 files changed, 6 insertions, 3 deletions
diff --git a/include/auth.php b/include/auth.php
index 387cab0af..ef5c6f0b4 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -26,6 +26,7 @@ if((x($_SESSION,'authenticated')) && (! ($_POST['auth-params'] == 'login'))) {
$r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
intval($_SESSION['uid']));
if(count($r)) {
+ $a->contact = $r[0];
$a->cid = $r[0]['id'];
$_SESSION['cid'] = $a->cid;
}
diff --git a/include/nav.php b/include/nav.php
index d24abd4ac..a7a2cf3f8 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -23,6 +23,8 @@
$a->page['nav'] .= "<a id=\"nav-contacts-link\" class=\"nav-link\" href=\"contacts\">Contacts</a>\r\n";
$a->page['nav'] .= "<a id=\"nav-home-link\" class=\"nav-link\" href=\"profile/{$_SESSION['uid']}\">Home</a>\r\n";
+
+ $a->page['nav'] .= "<a id=\"nav-network-link\" class=\"nav-link\" href=\"network\">Network</a>\r\n";
}
diff --git a/include/notifier.php b/include/notifier.php
index f7c0570d8..cf1076aad 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -151,9 +151,9 @@ if($argc < 3)
'$name' => xmlify($contact['name']),
'$profile_page' => xmlify($contact['url']),
'$thumb' => xmlify($contact['thumb']),
- '$owner_name' => xmlify($owner['name']),
- '$owner_profile_page' => xmlify($owner['url']),
- '$owner_thumb' => xmlify($owner['thumb']),
+ '$owner_name' => xmlify($item['owner-name']),
+ '$owner_profile_page' => xmlify($item['owner-link']),
+ '$owner_thumb' => xmlify($item['owner-avatar']),
'$item_id' => xmlify("urn:X-dfrn:$baseurl:{$owner['uid']}:{$item['hash']}"),
'$title' => xmlify($contact['name']),
'$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),