Merge https://github.com/friendica/friendica into pull

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
old mode 100755 (executable)
new mode 100644 (file)
index 551b307..b28b147
--- 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())
                                );
@@ -147,7 +151,7 @@ function notifications_content(&$a) {
                                                '$fullname' => $rr['fname'],
                                                '$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')),
+                                               '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')),
 
                                                '$knowyou' => $knowyou,
                                                '$approve' => t('Approve'),
@@ -194,7 +198,7 @@ function notifications_content(&$a) {
                                        '$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"),
                                        '$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')),
+                                       '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')),
                                        '$url' => zrl($rr['url']),
                                        '$knowyou' => $knowyou,
                                        '$approve' => t('Approve'),