From 277b464054b24f8d680ddbe762c9e438f6679592 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 3 Sep 2009 19:42:50 +0000
Subject: Created autofocus method to give focus to an element (primarily a
 form control) on page onload.

Updated some of the pages to use autofocus.
---
 actions/noticesearch.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'actions/noticesearch.php')

diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 1188e7e10..1cd987df3 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -137,6 +137,12 @@ class NoticesearchAction extends SearchAction
         $this->pagination($page > 1, $cnt > NOTICES_PER_PAGE,
                           $page, 'noticesearch', array('q' => $q));
     }
+
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('q');
+    }
 }
 
 class SearchNoticeList extends NoticeList {
-- 
cgit v1.2.3-54-g00ecf


From 6020d85191bdd838acbeb40ab17035e378b0aee1 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 7 Sep 2009 22:36:01 -0400
Subject: Don't "hightlight" search terms (by surrounding them in
 <strong>$term</strong>) when the term appears in an HTML attribute

Fixes http://status.net/trac/ticket/1852
---
 actions/noticesearch.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actions/noticesearch.php')

diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 1cd987df3..69dcd1a46 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -198,7 +198,7 @@ class SearchNoticeListItem extends NoticeListItem {
         $result  = preg_replace($pattern, '<strong>\\1</strong>', $text);
 
         /* Remove highlighting from inside links, loop incase multiple highlights in links */
-        $pattern = '/(href="[^"]*)<strong>('.$options.')<\/strong>([^"]*")/iU';
+        $pattern = '/(\w+="[^"]*)<strong>('.$options.')<\/strong>([^"]*")/iU';
         do {
             $result = preg_replace($pattern, '\\1\\2\\3', $result, -1, $count);
         } while ($count);
-- 
cgit v1.2.3-54-g00ecf