Merge pull request #6219 from MrPetovan/task/remove-x

[friendica.git] / src / Content / Text / HTML.php

diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index 9b73da56df2e4dc2f2a03817aca5b944cc8fe915..e452e68353e5f8db7af39068e94882075157c5a5 100644 (file)
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -908,7 +908,7 @@ class HTML
        public static function micropro($contact, $redirect = false, $class = '', $textmode = false)
        {
                // Use the contact URL if no address is available
-               if (!x($contact, "addr")) {
+               if (empty($contact['addr'])) {
                        $contact["addr"] = $contact["url"];
                }
 
@@ -924,7 +924,7 @@ class HTML
                }
 
                // If there is some js available we don't need the url
-               if (x($contact, 'click')) {
+               if (!empty($contact['click'])) {
                        $url = '';
                }
 
@@ -951,7 +951,7 @@ class HTML
         *
         * @return string Formatted HTML.
         */
-       public static function search($s, $id = 'search-box', $url = 'search', $save = false, $aside = true)
+       public static function search($s, $id = 'search-box', $url = 'search', $aside = true)
        {
                $mode = 'text';
 
@@ -966,7 +966,7 @@ class HTML
                                '$action_url' => $url,
                                '$search_label' => L10n::t('Search'),
                                '$save_label' => $save_label,
-                               '$savedsearch' => local_user() && Feature::isEnabled(local_user(), 'savedsearch'),
+                               '$savedsearch' => 'savedsearch',
                                '$search_hint' => L10n::t('@name, !forum, #tags, content'),
                                '$mode' => $mode
                        ];