diff options
| author | Friendika <info@friendika.com> | 2011-01-16 16:40:09 -0800 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-01-16 16:40:09 -0800 |
| commit | 3811923c14b5a2be88104ea8069d0d0bb3d9800a (patch) | |
| tree | 0f795c6a1da2523ffaf6b2e9aafeecf8de472c33 | |
| parent | fa9e1a9abba4e116a24f5df3680dcf1a6f8b3f72 (diff) | |
| download | volse-hubzilla-3811923c14b5a2be88104ea8069d0d0bb3d9800a.tar.gz volse-hubzilla-3811923c14b5a2be88104ea8069d0d0bb3d9800a.tar.bz2 volse-hubzilla-3811923c14b5a2be88104ea8069d0d0bb3d9800a.zip | |
put birthday reminders on default network page, add smileys to private mail
| -rw-r--r-- | mod/message.php | 2 | ||||
| -rw-r--r-- | mod/network.php | 4 | ||||
| -rw-r--r-- | mod/profile.php | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/mod/message.php b/mod/message.php index 251b5a414..9cc2e2826 100644 --- 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 08607fa18..5073b8a61 100644 --- 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 9b8388177..bcd2b64e3 100644 --- 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'); |