From 03756c65fc1c5bebfc4009bca32b5f681b5c1b21 Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Tue, 28 Jul 2015 17:55:21 -0700
Subject: make superblock block a channel if it's an owner as well as the
 current author; add @hostname to event hashes to make their use in vcalendar
 more RFC compliant

---
 include/conversation.php | 2 +-
 include/event.php        | 2 +-
 version.inc              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index fb012667e..76a2f47d1 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -597,7 +597,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 				if($arr_blocked) {
 					$blocked = false;
 					foreach($arr_blocked as $b) {
-						if(($b) && ($item['author_xchan'] == $b)) {
+						if(($b) && (($item['author_xchan'] == $b) || ($item['owner_xchan'] == $b))) { 
 							$blocked = true;
 							break;
 						}
diff --git a/include/event.php b/include/event.php
index a5cd93215..784da0545 100644
--- a/include/event.php
+++ b/include/event.php
@@ -281,7 +281,7 @@ function event_store_event($arr) {
 		if(array_key_exists('external_id',$arr))
 			$hash = $arr['external_id'];
 		else
-			$hash = random_string();
+			$hash = random_string() . '@' . get_app()->get_hostname();
 
 		$r = q("INSERT INTO event ( uid,aid,event_xchan,event_hash,created,edited,start,finish,summary,description,location,type,
 			adjust,nofinish,allow_cid,allow_gid,deny_cid,deny_gid)
diff --git a/version.inc b/version.inc
index 928fb3ee9..157b3f838 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-07-27.1106
+2015-07-28.1107
-- 
cgit v1.2.3