Increase specificity of [url][img] capture regex in BBCode::getAttachedData

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

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index 0c34cb94d498291e587f17bff8f4a0f40d2c760b..ce945aa1d6bbfa90e8c966f209e9e42fecd009be 100644 (file)
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -5,9 +5,8 @@
  */
 namespace Friendica\Content;
 
-use Friendica\Core\Protocol;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -127,12 +126,12 @@ class ForumManager
                        $o .= Renderer::replaceMacros(
                                $tpl,
                                [
-                                       '$title'        => L10n::t('Forums'),
+                                       '$title'        => DI::l10n()->t('Forums'),
                                        '$forums'       => $entries,
-                                       '$link_desc'    => L10n::t('External link to forum'),
+                                       '$link_desc'    => DI::l10n()->t('External link to forum'),
                                        '$total'        => $total,
                                        '$visible_forums' => $visible_forums,
-                                       '$showmore'     => L10n::t('show more')]
+                                       '$showmore'     => DI::l10n()->t('show more')]
                        );
                }
 
@@ -153,8 +152,8 @@ class ForumManager
        public static function profileAdvanced($uid)
        {
                $profile = intval(Feature::isEnabled($uid, 'forumlist_profile'));
-               if (! $profile) {
-                       return;
+               if (!$profile) {
+                       return '';
                }
 
                $o = '';
@@ -168,19 +167,15 @@ class ForumManager
                $contacts = self::getList($uid, $lastitem, false, false);
 
                $total_shown = 0;
-               $forumlist = '';
                foreach ($contacts as $contact) {
-                       $forumlist .= HTML::micropro($contact, true, 'forumlist-profile-advanced');
-                       $total_shown ++;
+                       $o .= HTML::micropro($contact, true, 'forumlist-profile-advanced');
+                       $total_shown++;
                        if ($total_shown == $show_total) {
                                break;
                        }
                }
 
-               if (count($contacts) > 0) {
-                       $o .= $forumlist;
-                       return $o;
-               }
+               return $o;
        }
 
        /**