fix warning of self-signed cert for photos of our own contacts in comment notificatio...

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index f64709ab6c73d4b3c7131cc64aac47761c4fa2a6..efb0dc75b2b22e51a105c7e0d73d77767f67e1d8 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -141,7 +141,7 @@ function contacts_content(&$a) {
 
                $cmd = $a->argv[2];
 
-               $orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+               $orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1",
                        intval($contact_id),
                        intval(local_user())
                );
@@ -222,7 +222,7 @@ function contacts_content(&$a) {
                        }
 
 
-                       contact_remove($contact_id);
+                       contact_remove($orig_record[0]['id']);
                        info( t('Contact has been removed.') . EOL );
                        goaway($a->get_baseurl() . '/contacts');
                        return; // NOTREACHED
@@ -319,7 +319,7 @@ function contacts_content(&$a) {
                        '$contact_id' => $r[0]['id'],
                        '$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ),
                        '$ignore_text' => (($r[0]['readonly']) ? t('Unignore this contact') : t('Ignore this contact') ),
-                       '$insecure' => (($r[0]['network'] !== NETWORK_DFRN && $r[0]['network'] !== NETWORK_MAIL && $r[0]['network'] !== NETWORK_FACEBOOK) ? $insecure : ''),
+                       '$insecure' => (($r[0]['network'] !== NETWORK_DFRN && $r[0]['network'] !== NETWORK_MAIL && $r[0]['network'] !== NETWORK_FACEBOOK && $r[0]['network'] !== NETWORK_DIASPORA) ? $insecure : ''),
                        '$info' => $r[0]['info'],
                        '$blocked' => (($r[0]['blocked']) ? '<div id="block-message">' . t('Currently blocked') . '</div>' : ''),
                        '$ignored' => (($r[0]['readonly']) ? '<div id="ignore-message">' . t('Currently ignored') . '</div>' : ''),