diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/message.php | 2 | ||||
| -rw-r--r-- | mod/network.php | 4 | ||||
| -rw-r--r-- | mod/profile.php | 2 | ||||
| -rw-r--r-- | mod/salmon.php | 7 |
4 files changed, 12 insertions, 3 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'); diff --git a/mod/salmon.php b/mod/salmon.php index 2ae6aa628..8c7d921c8 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -199,7 +199,12 @@ function salmon_post(&$a) { $hub = ''; - // consume_feed will only accept a follow activity from this person if there is no contact record. + /** + * + * anti-spam measure: consume_feed will accept a follow activity from + * this person (and nothing else) if there is no existing contact record. + * + */ $contact_rec = ((count($r)) ? $r[0] : null); |