calendar merge: fix event_xchan mixup

2019-05-01 15:35:20 +02:00
parent b8d8887d5a
commit 9594ce9a8a
2 changed files with 13 additions and 13 deletions
--- a/Zotlabs/Module/Channel_calendar.php
+++ b/Zotlabs/Module/Channel_calendar.php
@@ -147,11 +147,6 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 				}
 				return;
 			}
-
-			if($x[0]['event_xchan'] !== $channel['xchan_hash']) {
-				notice( t('Not allowed.') . EOL);
-				return;
-			}
 	
 			$acl->set($x[0]);
 	
@@ -570,7 +565,6 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 						'd' => $d,

 						'editable' => $edit ? true : false,
-						'className' => 'channel_calendar_id_' . $rr['id'],

 						'is_first'=>$is_first,
 						'item'=>$rr,