diff options
| author | root <root@diekershoff.homeunix.net> | 2010-12-21 07:14:58 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2010-12-21 07:14:58 +0100 |
| commit | 8cfa93b730f87edf98c52e9a38cfa015ce1f5d47 (patch) | |
| tree | da79ea09482cf8984c7d9e02076dd2e4f0e8e65e /mod/directory.php | |
| parent | ad32d85cfaa775efbd89b273bd51c82f4e45baab (diff) | |
| parent | ddec422de6707809aceb541e1191073b43aec18a (diff) | |
| download | volse-hubzilla-8cfa93b730f87edf98c52e9a38cfa015ce1f5d47.tar.gz volse-hubzilla-8cfa93b730f87edf98c52e9a38cfa015ce1f5d47.tar.bz2 volse-hubzilla-8cfa93b730f87edf98c52e9a38cfa015ce1f5d47.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/directory.php')
| -rw-r--r-- | mod/directory.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/directory.php b/mod/directory.php index e9bbf47ab..49aac657c 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -18,7 +18,7 @@ function directory_content(&$a) { if(x($a->data,'search')) $search = notags(trim($a->data['search'])); else - $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : ''); + $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); $tpl = load_view_file('view/directory_header.tpl'); @@ -37,7 +37,7 @@ function directory_content(&$a) { if($search) $search = dbesc($search); - $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`) AGAINST ('$search' IN BOOLEAN MODE) " : ""); + $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`,`keywords` ) AGAINST ('$search' IN BOOLEAN MODE) " : ""); $r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `publish` = 1 AND `user`.`blocked` = 0 $sql_extra "); |