summaryrefslogtreecommitdiff
path: root/app/Report/ReportParserGenerate.php
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2018-09-27 14:29:48 +0100
committerGreg Roach <fisharebest@webtrees.net>2018-09-27 19:59:06 +0100
commit4f92791549dc2ffa4c0e77c3f2ff5c848303085a (patch)
tree528581dbab4691ccb65212ca87b02dec836d706a /app/Report/ReportParserGenerate.php
parent87f373c26fd0a8b6e70843b3a55b370c731e5d67 (diff)
downloadwebtrees-4f92791549dc2ffa4c0e77c3f2ff5c848303085a.tar.gz
webtrees-4f92791549dc2ffa4c0e77c3f2ff5c848303085a.tar.bz2
webtrees-4f92791549dc2ffa4c0e77c3f2ff5c848303085a.zip
Code style
Diffstat (limited to 'app/Report/ReportParserGenerate.php')
-rw-r--r--app/Report/ReportParserGenerate.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Report/ReportParserGenerate.php b/app/Report/ReportParserGenerate.php
index b05d365767..0e2bceab83 100644
--- a/app/Report/ReportParserGenerate.php
+++ b/app/Report/ReportParserGenerate.php
@@ -1915,17 +1915,17 @@ class ReportParserGenerate extends ReportParserBase
$sql_params[$attr . 'gedcom'] = str_replace('\n', "\n", $match[1]);
unset($attrs[$attr]); // This filter has been fully processed
} elseif (preg_match('/^(?:\w+):PLAC CONTAINS (.+)$/', $value, $match)) {
+ // Don't unset this filter. This is just initial filtering
$sql_join .= " JOIN `##places` AS {$attr}a ON ({$attr}a.p_file = i_file)";
$sql_join .= " JOIN `##placelinks` AS {$attr}b ON ({$attr}a.p_file = {$attr}b.pl_file AND {$attr}b.pl_p_id = {$attr}a.p_id AND {$attr}b.pl_gid = i_id)";
$sql_where .= " AND {$attr}a.p_place LIKE CONCAT('%', :{$attr}place, '%')";
$sql_params[$attr . 'place'] = $match[1];
- // Don't unset this filter. This is just initial filtering
} elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
+ // Don't unset this filter. This is just initial filtering
$sql_where .= " AND i_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
$sql_params[$attr . 'contains1'] = $match[1];
$sql_params[$attr . 'contains2'] = $match[2];
$sql_params[$attr . 'contains3'] = $match[3];
- // Don't unset this filter. This is just initial filtering
}
}
}