debug logging in __process

[quix0rs-gnu-social.git] / actions / noticesearch.php

diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index eb3382779975659b50c65c2585f1bd65cdabae59..c257ecec56ebf23b4b9dda4c357824a2f192790a 100644 (file)
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -85,6 +85,10 @@ class NoticesearchAction extends SearchAction {
 
        function show_notice($notice, $terms) {
                $profile = $notice->getProfile();
+               if (!$profile) {
+                       common_log_db_error($notice, 'SELECT', __FILE__);
+                       return;
+               }
                # XXX: RDFa
                common_element_start('li', array('class' => 'notice_single',
                                                                                  'id' => 'notice-' . $notice->id));
@@ -139,8 +143,15 @@ class NoticesearchAction extends SearchAction {
        }
 
        function highlight($text, $terms) {
+               /* Highligh serach terms */
                $pattern = '/('.implode('|',array_map('htmlspecialchars', $terms)).')/i';
                $result = preg_replace($pattern, '<strong>\\1</strong>', $text);
+
+               /* Remove highlighting from inside links, loop incase multiple highlights in links */
+               $pattern = '/(href="[^"]*)<strong>('.implode('|',array_map('htmlspecialchars', $terms)).')<\/strong>([^"]*")/iU';
+               do {
+                       $result = preg_replace($pattern, '\\1\\2\\3', $result, -1, $count);
+               } while ($count);
                return $result;
        }
 }