Merge pull request #4246 from zeroadam/Widget-#3878

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index 232cbc5c9e92d8169f2fe374b47ca7acd9f23bde..66918e9a66e1c1fae6412acf91d0d07b7d25a093 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -10,6 +10,7 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Profile;
 use Friendica\Model\Term;
 use Friendica\Util\Map;
 
@@ -1011,7 +1012,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
                        $url = $redirect_url;
                        $sparkle = ' sparkle';
                } else {
-                       $url = zrl($url);
+                       $url = Profile::zrl($url);
                }
        }
 
@@ -1034,22 +1035,34 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
 }
 
 /**
- * search box
+ * Search box.
  *
- * @param string $s search query
- * @param string $id html id
- * @param string $url search url
- * @param boolean $savedsearch show save search button
+ * @param string $s     Search query.
+ * @param string $id    HTML id
+ * @param string $url   Search url.
+ * @param bool   $save  Show save search button.
+ * @param bool   $aside Display the search widgit aside.
+ *
+ * @return string Formatted HTML.
  */
-function search($s, $id = 'search-box', $url = 'search', $save = false, $aside = true) {
+function search($s, $id = 'search-box', $url = 'search', $save = false, $aside = true)
+{
+       $mode = 'text';
+
+       if (strpos($s, '#') === 0) {
+               $mode = 'tag';
+       }
+       $save_label = $mode === 'text' ? t('Save') : t('Follow');
+
        $values = array(
                        '$s' => htmlspecialchars($s),
                        '$id' => $id,
                        '$action_url' => $url,
                        '$search_label' => t('Search'),
-                       '$save_label' => t('Save'),
+                       '$save_label' => $save_label,
                        '$savedsearch' => Feature::isEnabled(local_user(),'savedsearch'),
                        '$search_hint' => t('@name, !forum, #tags, content'),
+                       '$mode' => $mode
                );
 
        if (!$aside) {
@@ -2094,7 +2107,8 @@ function text_highlight($s, $lang) {
        }
 
        $renderer = new Text_Highlighter_Renderer_Html($options);
-       $hl = Text_Highlighter::factory($lang);
+       $factory = new Text_Highlighter();
+       $hl = $factory->factory($lang);
        $hl->setRenderer($renderer);
        $o = $hl->highlight($s);
        $o = str_replace("\n", '', $o);