X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnoticesearch.php;h=bc052d512f5b1a0f6bea529d3be9ef5a5c94ba35;hb=4f3d1e93e97365deac2366bfe422e8301d773a25;hp=eb3382779975659b50c65c2585f1bd65cdabae59;hpb=a1515e5411eaed5e21bf56536438bc906d197d35;p=quix0rs-gnu-social.git
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index eb33827799..bc052d512f 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -40,7 +40,12 @@ class NoticesearchAction extends SearchAction {
# lcase it for comparison
$q = strtolower($q);
- $notice->whereAdd('MATCH(content) against (\''.addslashes($q).'\')');
+
+ if(common_config('db','type')=='mysql') {
+ $notice->whereAdd('MATCH(content) against (\''.addslashes($q).'\')');
+ } else {
+ $notice->whereAdd('to_tsvector(\'english\', content) @@ plainto_tsquery(\''.addslashes($q).'\')');
+ }
# Ask for an extra to see if there's more.
@@ -85,6 +90,11 @@ class NoticesearchAction extends SearchAction {
function show_notice($notice, $terms) {
$profile = $notice->getProfile();
+ if (!$profile) {
+ common_log_db_error($notice, 'SELECT', __FILE__);
+ $this->server_error(_('Notice without matching profile'));
+ return;
+ }
# XXX: RDFa
common_element_start('li', array('class' => 'notice_single',
'id' => 'notice-' . $notice->id));
@@ -132,6 +142,8 @@ class NoticesearchAction extends SearchAction {
'onclick' => 'doreply("'.$profile->nickname.'"); return false',
'title' => _('reply'),
'class' => 'replybutton'));
+ common_hidden('posttoken', common_session_token());
+
common_raw('→');
common_element_end('a');
common_element_end('p');
@@ -139,8 +151,15 @@ class NoticesearchAction extends SearchAction {
}
function highlight($text, $terms) {
+ /* Highligh serach terms */
$pattern = '/('.implode('|',array_map('htmlspecialchars', $terms)).')/i';
$result = preg_replace($pattern, '\\1', $text);
+
+ /* Remove highlighting from inside links, loop incase multiple highlights in links */
+ $pattern = '/(href="[^"]*)('.implode('|',array_map('htmlspecialchars', $terms)).')<\/strong>([^"]*")/iU';
+ do {
+ $result = preg_replace($pattern, '\\1\\2\\3', $result, -1, $count);
+ } while ($count);
return $result;
}
}