aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG6
-rw-r--r--include/import.php4
-rw-r--r--include/markdown.php3
3 files changed, 11 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 3813bc1a9..d97314674 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+Hubzilla 4.4.1 (2019-08-16)
+ - Fix wrong profile photo displayed when previewing and editing profiles
+ - Fix regression from 4.4 which prevented encrypted signatures from being used for encrypted messages
+ - Fix typo in queueworker addon which broke filtering of duplicate work
+
+
Hubzilla 4.4 (2019-08-13)
- Change primary directory from zotadel.net to hub.netzgemeinde.eu (requested by zotadel admin)
- Add Russian context help files
diff --git a/include/import.php b/include/import.php
index 1d3b7c035..d3e8f7091 100644
--- a/include/import.php
+++ b/include/import.php
@@ -1190,9 +1190,9 @@ function sync_files($channel, $files) {
logger('sync_files duplicate check: attach_by_hash() returned ' . print_r($x,true), LOGGER_DEBUG);
if($x['success']) {
- $orig_attach = $x[0];
+ $orig_attach = $x['data'];
$attach_exists = true;
- $attach_id = $x[0]['id'];
+ $attach_id = $orig_attach['id'];
}
$newfname = 'store/' . $channel['channel_address'] . '/' . get_attach_binname($att['content']);
diff --git a/include/markdown.php b/include/markdown.php
index 7d1f16958..0a8076799 100644
--- a/include/markdown.php
+++ b/include/markdown.php
@@ -264,6 +264,9 @@ function bb_to_markdown($Text, $options = []) {
// Remove empty zrl links
$Text = preg_replace("/\[zrl\=\].*?\[\/zrl\]/is", "", $Text);
+
+ // Remove unprocessed spoiler HTML tags
+ $Text = strip_tags(preg_replace("/(<\/div>)(>.+)$/im", "$1\n$2", $Text));
$Text = trim($Text);