Merge pull request #6324 from MrPetovan/bug/6316-remove-html-encode

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

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 397a1863d339efadf86d739acc6ea95e3d6f3e95..d4d4ff54949ae974ffad4c05b33f9f60fd88eea8 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -18,6 +18,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\FileTag;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
 require_once 'boot.php';
@@ -154,10 +155,10 @@ class Widget
                }
 
                return Renderer::replaceMacros(Renderer::getMarkupTemplate('nets.tpl'), array(
-                       '$title' => L10n::t('Networks'),
+                       '$title' => L10n::t('Protocols'),
                        '$desc' => '',
                        '$sel_all' => (($selected == '') ? 'selected' : ''),
-                       '$all' => L10n::t('All Networks'),
+                       '$all' => L10n::t('All Protocols'),
                        '$nets' => $nets,
                        '$base' => $baseurl,
                ));
@@ -175,10 +176,6 @@ class Widget
                        return '';
                }
 
-               if (!Feature::isEnabled(local_user(), 'filing')) {
-                       return '';
-               }
-
                $saved = PConfig::get(local_user(), 'system', 'filetags');
                if (!strlen($saved)) {
                        return;
@@ -270,11 +267,11 @@ class Widget
                if (!$cid) {
                        if (Profile::getMyURL()) {
                                $contact = DBA::selectFirst('contact', ['id'],
-                                               ['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $profile_uid]);
+                                               ['nurl' => Strings::normaliseLink(Profile::getMyURL()), 'uid' => $profile_uid]);
                                if (DBA::isResult($contact)) {
                                        $cid = $contact['id'];
                                } else {
-                                       $gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
+                                       $gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => Strings::normaliseLink(Profile::getMyURL())]);
                                        if (DBA::isResult($gcontact)) {
                                                $zcid = $gcontact['id'];
                                        }