version 7.8.7

(cherry picked from commit b4dffe5946)

CHANGELOG

@@ -1,3 +1,8 @@
+Hubzilla 7.8.7 (2022-12-03)
+	- Fix regression when adding feed contacts
+	- Fix regression new channel calendar event not created
+
+
 Hubzilla 7.8.6 (2022-11-14)
 	- Fix typo in boot.php
 

Zotlabs/Lib/Connect.php

@@ -109,10 +109,12 @@ class Connect {
 
 		if ($wf || $d) {
 
+			$xchan_hash = (($wf) ? $wf : $url);
+
 			// something was discovered - find the record which was just created.
 
 			$r = q("select * from xchan where ( xchan_hash = '%s' or xchan_url = '%s' or xchan_addr = '%s' ) $sql_options",
-				dbesc($wf ?? $url),
+				dbesc($xchan_hash),
 				dbesc($url),
 				dbesc($url)
 			);

boot.php

@@ -60,7 +60,7 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 
 define('PLATFORM_NAME', 'hubzilla');
-define('STD_VERSION', '7.8.6');
+define('STD_VERSION', '7.8.7');
 define('ZOT_REVISION', '6.0');
 
 define('DB_UPDATE_VERSION', 1253);

include/event.php

@@ -502,7 +502,6 @@ function ev_compare($a, $b) {
 
 
 function event_store_event($arr) {
-
 	$arr['created']        = $arr['created'] ?? datetime_convert();
 	$arr['edited']         = $arr['edited'] ?? datetime_convert();
 	$arr['etype']          = $arr['etype'] ?? 'event';
@@ -533,7 +532,7 @@ function event_store_event($arr) {
 
 	$existing_event = null;
 
-	if(isset($arr['event_hash'])) {
+	if(isset($arr['event_hash']) && $arr['event_hash']) {
 		$r = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
 			dbesc($arr['event_hash']),
 			intval($arr['uid'])
@@ -543,7 +542,7 @@ function event_store_event($arr) {
 		}
 	}
 
-	if(isset($arr['id'])) {
+	if(isset($arr['id']) && $arr['id']) {
 		$r = q("SELECT * FROM event WHERE id = %d AND uid = %d LIMIT 1",
 			intval($arr['id']),
 			intval($arr['uid'])
@@ -647,7 +646,6 @@ function event_store_event($arr) {
 				$hash = random_string(48);
 			}
 		}
-
 		$r = q("INSERT INTO event ( uid,aid,event_xchan,event_hash,created,edited,dtstart,dtend,summary,description,location,etype,
 			adjust,nofinish, event_status, event_status_date, event_percent, event_repeat, event_sequence, event_priority, event_vdata, allow_cid,allow_gid,deny_cid,deny_gid)
 			VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, '%s', %d, %d, '%s', '%s', '%s', '%s', '%s' ) ",