diff options
| author | Friendika <info@friendika.com> | 2011-10-08 15:23:53 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-10-08 15:23:53 -0700 |
| commit | fe0ac848d54608a17a0427fadb6ef0a708223bab (patch) | |
| tree | 83aa95bf28c44193ff392832420b1d1b1c0c1c40 | |
| parent | 43973e455abb612755fc4a58913f3c82d66d7d0d (diff) | |
| parent | 986c31c7b8f567b21726fcd33e0453bdc64d6f40 (diff) | |
| download | volse-hubzilla-fe0ac848d54608a17a0427fadb6ef0a708223bab.tar.gz volse-hubzilla-fe0ac848d54608a17a0427fadb6ef0a708223bab.tar.bz2 volse-hubzilla-fe0ac848d54608a17a0427fadb6ef0a708223bab.zip | |
Merge branch 'pull'
| -rw-r--r-- | js/main.js | 3 | ||||
| -rw-r--r-- | mod/notifications.php | 14 |
2 files changed, 13 insertions, 4 deletions
diff --git a/js/main.js b/js/main.js index 799330676..bd6b6d658 100644 --- a/js/main.js +++ b/js/main.js @@ -101,8 +101,7 @@ $("#nav-notifications-linkmenu").addClass("on"); nnm = $("#nav-notifications-menu"); - //nnm.html(""); - nnm.html("<li><a href='/notifications/network'>Show All Notifications</a></li>"); + nnm.html("<li><a href='"+baseurl+"/notifications/network'>Show All Notifications</a></li>"); //nnm.attr('popup','true'); eNotif.children("note").each(function(){ diff --git a/mod/notifications.php b/mod/notifications.php index 403efc5bd..d4cb4101b 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -179,7 +179,7 @@ function notifications_content(&$a) { $notif_tpl = get_markup_template('notifications.tpl'); $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, + `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND @@ -217,6 +217,11 @@ function notifications_content(&$a) { break; case ACTIVITY_FRIEND: + + $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $obj = parse_xml_string($xmlhead.$it['object']); + $it['fname'] = $obj->title; + $notif_content .= replace_macros($tpl_item_friends,array( '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'], '$item_image' => $it['author-avatar'], @@ -250,7 +255,7 @@ function notifications_content(&$a) { $notif_tpl = get_markup_template('notifications.tpl'); $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, + `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND @@ -288,6 +293,11 @@ function notifications_content(&$a) { break; case ACTIVITY_FRIEND: + + $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $obj = parse_xml_string($xmlhead.$it['object']); + $it['fname'] = $obj->title; + $notif_content .= replace_macros($tpl_item_friends,array( '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'], '$item_image' => $it['author-avatar'], |