Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

1 files changed, 3 insertions, 11 deletions

diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index 44211c8b9..8910adfa8 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -220,9 +220,6 @@ class Connedit extends Controller {
 				if($z)
 					$record = $z[0]['xlink_id'];
 			}
-			if($record) {
-				Master::Summon(array('Ratenotif','rating',$record));
-			}
 		}
 
 		if(($_REQUEST['pending']) && intval($orig_record[0]['abook_pending'])) {
@@ -478,16 +475,11 @@ class Connedit extends Controller {
 			}
 
 			if($cmd === 'refresh') {
-				if($orig_record[0]['xchan_network'] === 'zot') {
-					if(! zot_refresh($orig_record[0],App::get_channel()))
-						notice( t('Refresh failed - channel is currently unavailable.') );
-				}
-				elseif($orig_record[0]['xchan_network'] === 'zot6') {
+				if($orig_record[0]['xchan_network'] === 'zot6') {
 					if(! Libzot::refresh($orig_record[0],App::get_channel()))
 						notice( t('Refresh failed - channel is currently unavailable.') );
 				}
 				else {
-
 					// if you are on a different network we'll force a refresh of the connection basic info
 					Master::Summon(array('Notifier','permission_update',$contact_id));
 				}
@@ -667,7 +659,7 @@ class Connedit extends Controller {
 			);
 
 
-			if(in_array($contact['xchan_network'], ['zot6', 'zot'])) {
+			if($contact['xchan_network'] === 'zot6') {
 				$tools['fetchvc'] = [
 					'label' => t('Fetch Vcard'),
 					'url'    => z_root() . '/connedit/' . $contact['abook_id'] . '/fetchvc',
@@ -841,7 +833,7 @@ class Connedit extends Controller {
 				$locstr = unpunify($contact['xchan_url']);
 
 			$clone_warn = '';
-			$clonable = (in_array($contact['xchan_network'],['zot', 'zot6', 'rss']) ? true : false);
+			$clonable = in_array($contact['xchan_network'], ['zot6', 'rss']);
 			if(! $clonable) {
 				$clone_warn = '<strong>';
 				$clone_warn .= ((intval($contact['abook_not_here']))