Merge pull request #13121 from MrPetovan/task/13114-rename-group-to-circle

[friendica.git] / src / Content / Widget.php

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 93dc5b71759eeb62daa065aafc9fa4e47e6a377f..375d4df114f888fa1f49cf92a2ff60275b0b52e9 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -29,7 +29,7 @@ use Friendica\Core\Search;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\Group;
+use Friendica\Model\Circle;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Profile;
@@ -178,6 +178,10 @@ class Widget
                        $baseUrl = trim($baseUrl, '?') . '?';
                }
 
+               array_walk($options, function (&$value) {
+                       $value['ref'] = rawurlencode($value['ref']);
+               });
+
                return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/filter.tpl'), [
                        '$type'      => $type,
                        '$title'     => $title,
@@ -190,29 +194,29 @@ class Widget
        }
 
        /**
-        * Return group membership widget
+        * Return circle membership widget
         *
         * @param string $baseurl
         * @param string $selected
         * @return string
         * @throws \Exception
         */
-       public static function groups(string $baseurl, string $selected = ''): string
+       public static function circles(string $baseurl, string $selected = ''): string
        {
                if (!DI::userSession()->getLocalUserId()) {
                        return '';
                }
 
-               $options = array_map(function ($group) {
+               $options = array_map(function ($circle) {
                        return [
-                               'ref'  => $group['id'],
-                               'name' => $group['name']
+                               'ref'  => $circle['id'],
+                               'name' => $circle['name']
                        ];
-               }, Group::getByUserId(DI::userSession()->getLocalUserId()));
+               }, Circle::getByUserId(DI::userSession()->getLocalUserId()));
 
                return self::filter(
-                       'group',
-                       DI::l10n()->t('Groups'),
+                       'circle',
+                       DI::l10n()->t('Circles'),
                        '',
                        DI::l10n()->t('Everyone'),
                        $baseurl,