fix for 'show all notifications' on notifications drop-down to handle installations...

diff --git a/js/main.js b/js/main.js
index 799330676bf65db5bef03a5c74d9171bd69bdfbc..bd6b6d658b1450982593971a4611a6d9e1eb0e25 100644 (file)
--- 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 403efc5bd4098e020009d9b93f9fdafff12601ef..d4cb4101b0dcae2fb41bbc2230ba556f94fba943 100644 (file)
--- 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'],