diff options
| author | fisharebest <fisharebest@gmail.com> | 2013-07-25 21:04:02 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2013-07-25 21:04:02 +0000 |
| commit | bdaa886988026758b6a42542da525c8e7fa9286f (patch) | |
| tree | d060f0f37c9b23aac6447e0f0b71811cfe2d7185 | |
| parent | 7a2ad247cb71acb723bd57bb7f64517ea1b7a2ad (diff) | |
| download | webtrees-bdaa886988026758b6a42542da525c8e7fa9286f.tar.gz webtrees-bdaa886988026758b6a42542da525c8e7fa9286f.tar.bz2 webtrees-bdaa886988026758b6a42542da525c8e7fa9286f.zip | |
#1201221- Auto-complete PLAC field issue
| -rw-r--r-- | library/WT/Place.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/WT/Place.php b/library/WT/Place.php index 097ce70ebb..f8a7cec5a6 100644 --- a/library/WT/Place.php +++ b/library/WT/Place.php @@ -170,10 +170,10 @@ class WT_Place { " LEFT JOIN `##places` AS p7 ON (p6.p_parent_id=p7.p_id)". " LEFT JOIN `##places` AS p8 ON (p7.p_parent_id=p8.p_id)". " LEFT JOIN `##places` AS p9 ON (p8.p_parent_id=p9.p_id)". - " WHERE CONCAT_WS(', ', p1.p_place, p2.p_place, p3.p_place, p4.p_place, p5.p_place, p6.p_place, p7.p_place, p8.p_place, p9.p_place) LIKE CONCAT('%', ?, '%') AND CONCAT_WS(', ', p1.p_place, p2.p_place, p3.p_place, p4.p_place, p5.p_place, p6.p_place, p7.p_place, p8.p_place, p9.p_place) NOT LIKE CONCAT('%,%', ?, '%') AND p1.p_file=?". + " WHERE CONCAT_WS(', ', p1.p_place, p2.p_place, p3.p_place, p4.p_place, p5.p_place, p6.p_place, p7.p_place, p8.p_place, p9.p_place) LIKE CONCAT('%', ?, '%') AND CONCAT_WS(', ', p1.p_place, p2.p_place, p3.p_place, p4.p_place, p5.p_place, p6.p_place, p7.p_place, p8.p_place, p9.p_place) REGEXP CONCAT('^[^,]*', ?) AND p1.p_file=?". " ORDER BY CONCAT_WS(', ', p1.p_place, p2.p_place, p3.p_place, p4.p_place, p5.p_place, p6.p_place, p7.p_place, p8.p_place, p9.p_place) COLLATE '".WT_I18N::$collation."'" ) - ->execute(array($filter, $filter, $gedcom_id)) + ->execute(array($filter, preg_quote($filter), $gedcom_id)) ->fetchOneColumn(); foreach ($rows as $row) { $places[]=new WT_Place($row, $gedcom_id); |