more changelog

(cherry picked from commit 4338e4ef86)

CHANGELOG

@@ -1,4 +1,12 @@
-Hubzilla 8.6.2
+Hubzilla 8.6.3 (2023-09-16)
+	- Fix regression in jsonld_document_loader()
+	- Improve type checking for announce activities
+	- Improve query in drop_item() to prevent possible memory exhaustion
+	- Addon gallery: only add gallery code if the module is supported
+	- Adon hsse: port to bootstrap 5 namespaces - core issue #1793
+
+
+Hubzilla 8.6.2 (2023-08-27)
 	- Fix public stream comments/reactions fetching
 	- Fix notification text for likes in cases where obj.actor is not set
 	- Fix missing pdl file for mod cover_photo

Zotlabs/Lib/Activity.php

@@ -2600,11 +2600,11 @@ class Activity {
 		if (!$response_activity) {
 			if ($act->type === 'Announce') {
 				$s['author_xchan'] = self::get_attributed_to_actor_url($act);
-				$s['mid'] = $act->obj['id'];
+				$s['mid'] = $act->objprop('id') ?: $act->obj;
 
 				// Do not force new thread if the announce is from a group actor
 				if ($act->actor['type'] !== 'Group') {
-					$s['parent_mid'] = $act->obj['id'];
+					$s['parent_mid'] = $act->objprop('id') ?: $act->obj;
 				}
 			}
 

boot.php

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

include/items.php

@@ -3920,16 +3920,19 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL) {
 
 		$notify_id = intval($item['id']);
 
-		$items = q("select * from item where parent = %d and uid = %d",
+		$items = q("select id, resource_id, uid, resource_type, mid from item where parent = %d and uid = %d",
 			intval($item['id']),
 			intval($item['uid'])
 		);
+
 		if($items) {
-			foreach($items as $i)
+			foreach($items as $i) {
 				delete_item_lowlevel($i, $stage);
+			}
 		}
-		else
+		else {
 			delete_item_lowlevel($item, $stage);
+		}
 
 		if(! $interactive)
 			return 1;

include/network.php

@@ -2092,9 +2092,7 @@ function jsonld_document_loader($url) {
 
 	if (file_exists($filename) && filemtime($filename) > time() - (12 * 60 * 60)) {
 		logger('loading ' . $filename . ' from recent cache');
-
-		$doc->document = file_get_contents($filename);
-		return $doc;
+		return file_get_contents($filename);
 	}
 
 	$r = jsonld_default_document_loader($url);
@@ -2111,8 +2109,7 @@ function jsonld_document_loader($url) {
 
 	if (file_exists($filename)) {
 		logger('loading ' . $filename . ' from longterm cache');
-		$doc->document = file_get_contents($filename);
-		return $doc;
+		return file_get_contents($filename);
 	}
 	else {
 		logger($filename . ' does not exist and cannot be loaded');