aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-03-06 08:50:36 +0000
committerMario <mario@mariovavti.com>2021-03-06 09:51:45 +0100
commit9b5979c83a92436ebf3f90914d8a45605d8a6efe (patch)
tree72d1016c92797e56f35d0304234784e8b70d8719
parent7d03ff20436476fbbfe0f61fa9001c6cf2b392d4 (diff)
downloadvolse-hubzilla-9b5979c83a92436ebf3f90914d8a45605d8a6efe.tar.gz
volse-hubzilla-9b5979c83a92436ebf3f90914d8a45605d8a6efe.tar.bz2
volse-hubzilla-9b5979c83a92436ebf3f90914d8a45605d8a6efe.zip
fix varable name and more changelog
(cherry picked from commit 7460b1eecbb1d4eb7937ab551f7d4b333eba5a38)
-rw-r--r--CHANGELOG2
-rw-r--r--include/channel.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9cfc53ebd..520567c1e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@ Hubzilla 5.4 (2021-03-xx)
- Implement ActivityStreams discovery in mod profile
- Implement ActivityStreams discovery in mod channel
- Streamline OS folder and file permissions
+ - Add polish translations
- Implement ThreadListener in mod activity_match
- Improve ThreadListener handling
- Use mail envelope instead of lock icon for direct messages
@@ -30,6 +31,7 @@ Hubzilla 5.4 (2021-03-xx)
- Port util/connect to Lib/Connect
Bugfixes
+ - Fix visible/empty notifications for blocked contacts items
- Fix issue where URL fragment was turned into hashtag if the hashtag existed elsewhere in the post (issue #1518)
- Fix audio and video embeds for media sources without media format extension
- Fix issue where zot package was saved in iconf instead of the decoded activity
diff --git a/include/channel.php b/include/channel.php
index 4f48402d2..ecb7c24f7 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -508,7 +508,7 @@ function create_identity($arr) {
if($group_hash) {
group_add_member($newuid,t('Friends'),$ret['channel']['channel_hash']);
- $default_collection = '';
+ $default_collection_str = '';
// if our role_permissions indicate that we're using a default collection ACL, add it.
if(is_array($role_permissions) && $role_permissions['default_collection']) {
$default_collection_str = '<' . $group_hash . '>';