From 05fa89a5c7e37e60d877dbbc19cca0539fda7b19 Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sat, 6 Mar 2010 12:31:54 +0100 Subject: [PATCH] Fix soundex in quick search. Signed-off-by: Florent Bruneau --- classes/userfilter.php | 2 +- include/ufbuilder.inc.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/classes/userfilter.php b/classes/userfilter.php index 801da2c..aed33ae 100644 --- a/classes/userfilter.php +++ b/classes/userfilter.php @@ -2015,7 +2015,7 @@ class UserFilter extends PlFilter /* We don't return joins, since with_sn forces the SELECT to run on search_name first */ if ($this->with_sn && !$this->with_forced_sn) { return array( - 'sn' => PlSqlJoin::left('search_name', '$ME.uid = $PID') + 'sn' => PlSqlJoin::left('search_name', '$ME.pid = $PID') ); } else { return array(); diff --git a/include/ufbuilder.inc.php b/include/ufbuilder.inc.php index ee8f3fd..35134bb 100644 --- a/include/ufbuilder.inc.php +++ b/include/ufbuilder.inc.php @@ -112,7 +112,7 @@ class UserFilterBuilder } public function i($key, $def = 0) { - return intval(trim(Env::i($this->envprefix . $key, $def))); + return Env::i($this->envprefix . $key, $def); } public function v($key, $def = null) { @@ -490,7 +490,7 @@ class UFBF_Quick extends UFB_Field } else { $flags = array('public'); } - if ($ufb->i('soundex')) { + if ($ufb->i('with_soundex')) { $soundex = true; $st = array(); foreach ($strings as $string) { @@ -1051,4 +1051,6 @@ class UFBF_MentorExpertise extends UFBF_Text } } // }}} + +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?> -- 2.1.4