From: Michael Vogel <icarus@dabo.de>
Date: Tue, 2 Sep 2014 23:03:23 +0000 (+0200)
Subject: Bugfix: Messages when ignoring, blocking and archiving contacts now returns the corre... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dd908c841538374dd6156cc57f5e743cf51d8048;p=friendica.git

Bugfix: Messages when ignoring, blocking and archiving contacts now returns the correct messages.
---

diff --git a/mod/contacts.php b/mod/contacts.php
index 0c53736220..b212803b32 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -268,7 +268,7 @@ function contacts_content(&$a) {
 			goaway($a->get_baseurl(true) . '/contacts');
 			return; // NOTREACHED
 		}
-		
+
 		if($cmd === 'update') {
 			_contact_update($contact_id);
 			goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
@@ -278,9 +278,10 @@ function contacts_content(&$a) {
 		if($cmd === 'block') {
 			$r = _contact_block($contact_id, $orig_record[0]);
 			if($r) {
-				info( (($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL );
+				$blocked = (($orig_record[0]['blocked']) ? 0 : 1);
+				info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')).EOL);
 			}
-			
+
 			goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
 			return; // NOTREACHED
 		}
@@ -288,9 +289,10 @@ function contacts_content(&$a) {
 		if($cmd === 'ignore') {
 			$r = _contact_ignore($contact_id, $orig_record[0]);
 			if($r) {
-				info( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL );
+				$readonly = (($orig_record[0]['readonly']) ? 0 : 1);
+				info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')).EOL);
 			}
-			
+
 			goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
 			return; // NOTREACHED
 		}
@@ -299,9 +301,10 @@ function contacts_content(&$a) {
 		if($cmd === 'archive') {
 			$r = _contact_archive($contact_id, $orig_record[0]);
 			if($r) {
-				info( (($archived) ? t('Contact has been archived') : t('Contact has been unarchived')) . EOL );
-			}			
-			
+				$archived = (($orig_record[0]['archive']) ? 0 : 1);
+				info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')).EOL);
+			}
+
 			goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
 			return; // NOTREACHED
 		}