diff options
| author | fisharebest <fisharebest@gmail.com> | 2011-11-14 11:56:43 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2011-11-14 11:56:43 +0000 |
| commit | 7ffd65bc149e89684a3f778545a76e07d7dfe779 (patch) | |
| tree | 4c6f23126a25d54314c755b84bfcbb60eac0e321 /library | |
| parent | 09f2705b719b315cce9e2e14531cff384935439e (diff) | |
| download | webtrees-7ffd65bc149e89684a3f778545a76e07d7dfe779.tar.gz webtrees-7ffd65bc149e89684a3f778545a76e07d7dfe779.tar.bz2 webtrees-7ffd65bc149e89684a3f778545a76e07d7dfe779.zip | |
Fix: list of surnames on indi-list ignoring the "include married names" option. We need the where clause on both the inner and outer SQL statements
Diffstat (limited to 'library')
| -rw-r--r-- | library/WT/Query/Name.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/library/WT/Query/Name.php b/library/WT/Query/Name.php index fcc4b134d7..79cb46ed4e 100644 --- a/library/WT/Query/Name.php +++ b/library/WT/Query/Name.php @@ -361,6 +361,9 @@ class WT_Query_Name { $sql.=" AND n_surn NOT IN ('', '@N.N.')"; } $sql.=" GROUP BY n_surn COLLATE '".WT_I18N::$collation."', n_file) n2 ON (n1.n_surn=n2.n_surn COLLATE '".WT_I18N::$collation."' AND n1.n_file=n2.n_file)"; + if (!$marnm) { + $sql.=" AND n_type!='_MARNM'"; + } $list=array(); foreach (WT_DB::prepare($sql)->fetchAll() as $row) { |