Update install wizard

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
index 537850e007400144028a13bf708d13030c9b03af..675d1c81e130ed211dd5a73fc2ce574211788153 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -51,6 +51,21 @@ function user_remove($uid) {
 
 
 function contact_remove($id) {
+
+       $r = q("select uid from contact where id = %d limit 1",
+               intval($id)
+       );
+       if((! count($r)) || (! intval($r[0]['uid'])))
+               return;
+
+       $archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts');
+       if($archive) {
+               q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d limit 1",
+                       intval($id)
+               );
+               return;
+       }
+
        q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1",
                intval($id)
        );
@@ -194,7 +209,7 @@ function contact_photo_menu($contact) {
        );
        
        
-       $args = array('contact' => $contact, 'menu' => $menu);
+       $args = array('contact' => $contact, 'menu' => &$menu);
        
        call_hooks('contact_photo_menu', $args);