harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix mod/search_ac (sort of)

Browse Source
This commit is contained in:
friendica 2013-09-02 20:51:04 -07:00
parent 615bf23733
commit c646388cd9
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mod/search_ac.php
View File

@ -27,18 +27,19 @@ function search_ac_init(&$a){
// Priority to people searches // Priority to people searches
if ($search) { if ($search) {
$people_sql_extra = protect_sprintf(" AND `name` LIKE '%". dbesc($search) . "%' "); $people_sql_extra = protect_sprintf(" AND `xchan_name` LIKE '%". dbesc($search) . "%' ");
$tag_sql_extra = protect_sprintf(" AND term LIKE '%". dbesc($search) . "%' "); $tag_sql_extra = protect_sprintf(" AND term LIKE '%". dbesc($search) . "%' ");
} }
$r = q("SELECT `id`, `name`, `micro`, `url` FROM `contact`
WHERE `uid` = %d AND `pending` = 0 $r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms
$people_sql_extra FROM abook left join xchan on abook_xchan = xchan_hash
ORDER BY `name` ASC ", WHERE abook_channel = %d AND not ( abook_flags & %d ) $people_sql_extra order by xchan_name asc" ,
intval(local_user()) intval(local_user()),
intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED)
); );
if(count($r)) { if($r) {
foreach($r as $g) { foreach($r as $g) {
$x['photos'][] = $g['micro']; $x['photos'][] = $g['micro'];
$x['links'][] = $g['url']; $x['links'][] = $g['url'];

2
view/theme/redbasic/css/style.css
View File

@ -2098,7 +2098,7 @@ aside input[type='text'] {
display: block; display: block;
color: #FFFFFF; color: #FFFFFF;
margin-top: 15px; margin-top: 15px;
background-color: #FF6666; background-color: #F80000;
-webkit-border-radius: $radiuspx ; -webkit-border-radius: $radiuspx ;
-moz-border-radius: $radiuspx; -moz-border-radius: $radiuspx;
border-radius: $radiuspx; border-radius: $radiuspx;