put birthday reminders on default network page, add smileys to private mail

diff --git a/mod/message.php b/mod/message.php
index 251b5a4149125d80796ce32b1ebb88f8cf120584..9cc2e2826cf0e5d6eae7d45a6609d2e52cefda77 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -270,7 +270,7 @@ function message_content(&$a) {
                                '$sparkle' => $sparkle,
                                '$from_photo' => $message['from-photo'],
                                '$subject' => $message['title'],
-                               '$body' => bbcode($message['body']),
+                               '$body' => smilies(bbcode($message['body'])),
                                '$delete' => t('Delete message'),
                                '$to_name' => $message['name'],
                                '$date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A')

diff --git a/mod/network.php b/mod/network.php
index 08607fa18e8d5baf02faa543f3365bf362c3705e..5073b8a61d28269a11b3462a26c534d7d20b9254 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -115,6 +115,10 @@ function network_content(&$a, $update = 0) {
                $o = '<h4>' . t('Group: ') . $r[0]['name'] . '</h4>' . $o;
        }
 
+       if((! $group) && (! $update))
+               $o .= get_birthdays();
+
+
        $r = q("SELECT COUNT(*) AS `total`
                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0

diff --git a/mod/profile.php b/mod/profile.php
index 9b8388177d5bdde811994aba5eb3e68d5295d19f..bcd2b64e36c5b1b44c6920caf82795fc1f83bbc4 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -230,7 +230,7 @@ function profile_content(&$a, $update = 0) {
 
 
        if($is_owner && ! $update)
-                       $o .= get_birthdays();
+               $o .= get_birthdays();
 
        $cmnt_tpl = load_view_file('view/comment_item.tpl');