diff options
| author | Thomas Willingham <founder@kakste.com> | 2012-04-02 00:29:27 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2012-04-02 00:29:27 +0100 |
| commit | 210586eaed18afc4d9ff613ee8f1ea0acdec621a (patch) | |
| tree | 49c8e91f210815eeccd6925457664f39380f0a82 /mod/notifications.php | |
| parent | 8406803473773404b18b95c709da0b8f5da59d3c (diff) | |
| parent | 23dc376364b7d8f8e27e3493fe3edbf5cf768a35 (diff) | |
| download | volse-hubzilla-210586eaed18afc4d9ff613ee8f1ea0acdec621a.tar.gz volse-hubzilla-210586eaed18afc4d9ff613ee8f1ea0acdec621a.tar.bz2 volse-hubzilla-210586eaed18afc4d9ff613ee8f1ea0acdec621a.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/notifications.php')
| -rwxr-xr-x | mod/notifications.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mod/notifications.php b/mod/notifications.php index ff131010f..690a99562 100755 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -37,7 +37,11 @@ function notifications_post(&$a) { intval($intro_id) ); if(! $fid) { - $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1", + + // The check for blocked and pending is in case the friendship was already approved + // and we just want to get rid of the now pointless notification + + $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 AND `blocked` = 1 AND `pending` = 1 LIMIT 1", intval($contact_id), intval(local_user()) ); @@ -145,7 +149,7 @@ function notifications_content(&$a) { '$contact_id' => $rr['contact-id'], '$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/person-175.jpg"), '$fullname' => $rr['fname'], - '$url' => $rr['furl'], + '$url' => zrl($rr['furl']), '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), '$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')), @@ -195,7 +199,7 @@ function notifications_content(&$a) { '$fullname' => $rr['name'], '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), '$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')), - '$url' => $rr['url'], + '$url' => zrl($rr['url']), '$knowyou' => $knowyou, '$approve' => t('Approve'), '$note' => $rr['note'], |