use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
+use Friendica\Model\Profile;
use Friendica\Model\Term;
use Friendica\Util\Map;
$url = $redirect_url;
$sparkle = ' sparkle';
} else {
- $url = zrl($url);
+ $url = Profile::zrl($url);
}
}
}
/**
- * 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) {
return true;
}
-function file_tag_unsave_file($uid, $item, $file, $cat = false) {
- require_once "include/files.php";
-
+function file_tag_unsave_file($uid, $item, $file, $cat = false)
+{
if (! intval($uid)) {
return false;
}
}
$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);