summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfisharebest <fisharebest@gmail.com>2011-01-24 09:46:38 +0000
committerfisharebest <fisharebest@gmail.com>2011-01-24 09:46:38 +0000
commit838730244c385db1241ee1ec04d6857d141bfb2e (patch)
treec8726660ae1e927000d1f160f8f9c78dee5e57f9
parent5b55f155ea5463cd2e1061a5932aebc4a4f79fd4 (diff)
downloadwebtrees-838730244c385db1241ee1ec04d6857d141bfb2e.tar.gz
webtrees-838730244c385db1241ee1ec04d6857d141bfb2e.tar.bz2
webtrees-838730244c385db1241ee1ec04d6857d141bfb2e.zip
#706349 - MARNM, new spouse not adding 10552svn
-rw-r--r--includes/functions/functions_edit.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/includes/functions/functions_edit.php b/includes/functions/functions_edit.php
index 2294899cc0..22771ca347 100644
--- a/includes/functions/functions_edit.php
+++ b/includes/functions/functions_edit.php
@@ -1919,7 +1919,14 @@ function addNewName() {
if (preg_match_all('/('.WT_REGEX_TAG.')/', $ADVANCED_NAME_FACTS, $match)) {
$tags=array_merge($tags, $match[1]);
}
- foreach ($tags as $tag) {
+
+ // Paternal and Polish surname traditions can also create a _MARNM
+ $SURNAME_TRADITION=get_gedcom_setting(WT_GED_ID, 'SURNAME_TRADITION');
+ if ($SURNAME_TRADITION=='paternal' || $SURNAME_TRADITION=='polish') {
+ $tags[]='_MARNM';
+ }
+
+ foreach (array_unique($tags) as $tag) {
$TAG=safe_POST($tag, WT_REGEX_UNSAFE);
if ($TAG) {
$gedrec.="2 {$tag} {$TAG}\n";