summaryrefslogtreecommitdiff
path: root/modules_v3
diff options
context:
space:
mode:
authorfisharebest <fisharebest@gmail.com>2011-10-24 14:19:35 +0000
committerfisharebest <fisharebest@gmail.com>2011-10-24 14:19:35 +0000
commit49bb9ce77b087632d9488b76873ffc1f18b351ef (patch)
treeac3c6ab0b54ba784371a7c401e78e0ea1bd4453e /modules_v3
parentf474eba00291d4f1a0b3c470663d65140daa7cbe (diff)
downloadwebtrees-49bb9ce77b087632d9488b76873ffc1f18b351ef.tar.gz
webtrees-49bb9ce77b087632d9488b76873ffc1f18b351ef.tar.bz2
webtrees-49bb9ce77b087632d9488b76873ffc1f18b351ef.zip
#876341 - Mutually incompatible report parameters
Diffstat (limited to 'modules_v3')
-rw-r--r--modules_v3/cemetery_report/report.xml2
-rw-r--r--modules_v3/death_report/report.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules_v3/cemetery_report/report.xml b/modules_v3/cemetery_report/report.xml
index f9ff391acc..204c5f7197 100644
--- a/modules_v3/cemetery_report/report.xml
+++ b/modules_v3/cemetery_report/report.xml
@@ -63,7 +63,7 @@
</TextBox>
</Header>
<Body>
- <List list="individual" filter1="BURI:PLAC CONTAINS $deathplace" sortby="$sortby">
+ <List list="individual" filter1="BURI:PLAC CONTAINS $deathplace" filter2="REGEXP /\n1 BURI/" sortby="$sortby">
<Cell style="text" width="$namewidth"><GetPersonName id="" />
<if condition="$adlist=='_MARNM'">
<RepeatTag tag="NAME:_MARNM">
diff --git a/modules_v3/death_report/report.xml b/modules_v3/death_report/report.xml
index 1359c168f3..1702348a80 100644
--- a/modules_v3/death_report/report.xml
+++ b/modules_v3/death_report/report.xml
@@ -54,7 +54,7 @@
</Header>
<Body>
- <List list="individual" filter1="DEAT:PLAC CONTAINS $deathplace" filter2="DEAT:DATE GTE $deathdate1" filter3="DEAT:DATE LTE $deathdate2" filter4="NAME CONTAINS $name" sortby="$sortby">
+ <List list="individual" filter1="DEAT:PLAC CONTAINS $deathplace" filter2="DEAT:DATE GTE $deathdate1" filter3="DEAT:DATE LTE $deathdate2" filter4="NAME CONTAINS $name" filter5="REGEXP /\n1 DEAT/" sortby="$sortby">
<TextBox width="200">
<Text style="text"><GetPersonName id="" />
<if condition="$adlist=='_MARNM'">