clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Friendika 2011-01-16 16:40:09 -08:00
parent fa9e1a9abb
commit 3811923c14
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/message.php
View File

@ -270,7 +270,7 @@ function message_content(&$a) {
'$sparkle' => $sparkle, '$sparkle' => $sparkle,
'$from_photo' => $message['from-photo'], '$from_photo' => $message['from-photo'],
'$subject' => $message['title'], '$subject' => $message['title'],
'$body' => bbcode($message['body']), '$body' => smilies(bbcode($message['body'])),
'$delete' => t('Delete message'), '$delete' => t('Delete message'),
'$to_name' => $message['name'], '$to_name' => $message['name'],
'$date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A') '$date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A')

4
mod/network.php
View File

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

2
mod/profile.php
View File

@ -230,7 +230,7 @@ function profile_content(&$a, $update = 0) {
if($is_owner && ! $update) if($is_owner && ! $update)
$o .= get_birthdays(); $o .= get_birthdays();
$cmnt_tpl = load_view_file('view/comment_item.tpl'); $cmnt_tpl = load_view_file('view/comment_item.tpl');