From b713c9a491c02725f79a1ef85a01b65c2968bd2d Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 9 Nov 2022 09:27:33 +0000 Subject: fix new uuid created when editing post --- Zotlabs/Module/Item.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index a5e7b31ea..8e6106e79 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -393,7 +393,7 @@ class Item extends Controller { $owner_hash = null; - $message_id = ((x($_REQUEST, 'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : ''); + $message_id = ((x($_REQUEST, 'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : null); $created = ((x($_REQUEST, 'created')) ? datetime_convert(date_default_timezone_get(), 'UTC', $_REQUEST['created']) : datetime_convert()); $post_id = ((x($_REQUEST, 'post_id')) ? intval($_REQUEST['post_id']) : 0); $app = ((x($_REQUEST, 'source')) ? strip_tags($_REQUEST['source']) : ''); @@ -710,6 +710,7 @@ class Item extends Controller { $expires = $orig_post['expires']; $comments_closed = $orig_post['comments_closed']; $mid = $orig_post['mid']; + $uuid = $orig_post['uuid']; $thr_parent = $orig_post['thr_parent']; $parent_mid = $orig_post['parent_mid']; $plink = $orig_post['plink']; @@ -1000,10 +1001,8 @@ class Item extends Controller { $notify_type = (($parent) ? 'comment-new' : 'wall-new'); - $uuid = (($message_id) ? $message_id : item_message_id()); - - $mid = $mid ?? z_root() . '/item/' . $uuid; - + $uuid = $uuid ?? $message_id ?? item_message_id(); + $mid = $mid ?? z_root() . '/item/' . $uuid; if ($is_poll) { $poll = [ -- cgit v1.2.3 From 42e5a50e4fcac6cbd0c41bcfe10649b76664d2c1 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 9 Nov 2022 09:33:18 +0000 Subject: changelog and version --- CHANGELOG | 4 ++++ boot.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index e486ef83a..1731eceb8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +Hubzilla 7.8.4 (2022-11-09) + - Fix new uuid created when editing a post + + Hubzilla 7.8.3 (2022-11-07) - Fix regression where auto created directories were not created with public permissions - Fix regression where pinned/featured state of apps was not displayed correctly diff --git a/boot.php b/boot.php index 4c817924e..150d9a4b2 100644 --- a/boot.php +++ b/boot.php @@ -60,7 +60,7 @@ require_once('include/bbcode.php'); require_once('include/items.php'); define('PLATFORM_NAME', 'hubzilla'); -define('STD_VERSION', '7.9.3'); +define('STD_VERSION', '7.9.4'); define('ZOT_REVISION', '6.0'); define('DB_UPDATE_VERSION', 1253); -- cgit v1.2.3