mirror of
https://github.com/friendica/friendica
synced 2024-10-13 15:34:34 +02:00
put birthday reminders on default network page, add smileys to private mail
This commit is contained in:
parent
fa9e1a9abb
commit
3811923c14
|
@ -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')
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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');
|
||||
|
||||
|
|
Loading…
Reference in a new issue