Merge remote-tracking branch 'upstream/develop' into hide-sharer

diff --cc src/Module/Conversation/Community.php
index 75a8e158ac85652fa32bb14a9aa8aee64ce5811c,e46091bc3501075f786b524ba7bc4b7087163597..97cc44eaffb9e46b43cdd69dcc376cfa574046cf
--- 1/src/Module/Conversation/Community.php
--- 2/src/Module/Conversation/Community.php
+++ b/src/Module/Conversation/Community.php
@@@ -117,36 -117,13 +117,36 @@@ class Community extends BaseModul
                        '$title'        => DI::l10n()->t('Accounts'),
                        '$content'      => self::$content,
                        '$accounttype'  => $parameters['accounttype'],
-                       '$all'          => DI::l10n()->t('All Accounts'),
-                       '$person'       => DI::l10n()->t('Personal Accounts'),
-                       '$organisation' => DI::l10n()->t('Organisation Accounts'),
-                       '$news'         => DI::l10n()->t('News Accounts'),
-                       '$community'    => DI::l10n()->t('Communities'),
+                       '$all'          => DI::l10n()->t('All'),
+                       '$person'       => DI::l10n()->t('Persons'),
+                       '$organisation' => DI::l10n()->t('Organisations'),
+                       '$news'         => DI::l10n()->t('News'),
+                       '$community'    => DI::l10n()->t('Forums'),
                ]);
  
 +              if (local_user() && DI::config()->get('system', 'community_no_sharer')) {
 +                      $path = self::$content . ($parameters['accounttype'] ? '/' . $parameters['accounttype'] : '');
 +                      $query_parameters = [];
 +      
 +                      if (!empty($_GET['since_id'])) {
 +                              $query_parameters['since_id'] = $_GET['since_id'];
 +                      }
 +                      if (!empty($_GET['max_id'])) {
 +                              $query_parameters['max_id'] = $_GET['max_id'];
 +                      }
 +      
 +                      $path_all = $path . (!empty($query_parameters) ? '?' . http_build_query($query_parameters) : '');
 +                      $path_no_sharer = $path . '?' . http_build_query(array_merge($query_parameters, ['no_sharer' => true]));
 +                      DI::page()['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/community_sharer.tpl'), [
 +                              '$title'           => DI::l10n()->t('Own Contacts'),
 +                              '$path_all'        => $path_all,
 +                              '$path_no_sharer'  => $path_no_sharer,
 +                              '$no_sharer'       => !empty($_REQUEST['no_sharer']),
 +                              '$all'             => DI::l10n()->t('Include'),
 +                              '$no_sharer_label' => DI::l10n()->t('Hide'),
 +                      ]);
 +              }
 +
                if (Feature::isEnabled(local_user(), 'trending_tags')) {
                        DI::page()['aside'] .= TrendingTags::getHTML(self::$content);
                }