#859050 - cannot add "1 RESN" to "0 NOTE"

2 files changed, 9 insertions, 5 deletions

diff --git a/includes/db_schema/db_schema_14_15.php b/includes/db_schema/db_schema_14_15.php
index e842bc53bc..233e27151e 100644
--- a/includes/db_schema/db_schema_14_15.php
+++ b/includes/db_schema/db_schema_14_15.php
@@ -1,6 +1,7 @@
 <?php
 // Update the database schema from version 14 to 15
 // - delete old config settings
+// - update existing ones - we changed the default, but there is no GUI to edit it
 //
 // The script should assume that it can be interrupted at
 // any point, and be able to continue by re-running the script.
@@ -37,6 +38,9 @@ if (!defined('WT_WEBTREES')) {
 self::exec("DELETE FROM `##gedcom_setting` WHERE setting_name='GEDCOM_DEFAULT_TAB'");
 self::exec("DELETE FROM `##user_setting` WHERE setting_name='default'");
 
+// There is no way to add a RESN tag to NOTE objects
+self::exec("UPDATE `##gedcom_setting` SET setting_value='SOUR,RESN' WHERE setting_name='NOTE_FACTS_ADD' AND setting_value='SOUR'");
+
 // Update the version to indicate success
 set_site_setting($schema_name, $next_version);
 
diff --git a/includes/set_gedcom_defaults.php b/includes/set_gedcom_defaults.php
index 060eaabb2c..beeeaf67ca 100644
--- a/includes/set_gedcom_defaults.php
+++ b/includes/set_gedcom_defaults.php
@@ -51,7 +51,7 @@ set_gedcom_setting($ged_id, 'ENABLE_AUTOCOMPLETE',          true);
 set_gedcom_setting($ged_id, 'EXPAND_NOTES',                 false);
 set_gedcom_setting($ged_id, 'EXPAND_RELATIVES_EVENTS',      false);
 set_gedcom_setting($ged_id, 'EXPAND_SOURCES',               false);
-set_gedcom_setting($ged_id, 'FAM_FACTS_ADD',                'CENS,MARR,RESI,SLGS,MARR_CIVIL,MARR_RELIGIOUS,MARR_PARTNERS');
+set_gedcom_setting($ged_id, 'FAM_FACTS_ADD',                'CENS,MARR,RESI,SLGS,MARR_CIVIL,MARR_RELIGIOUS,MARR_PARTNERS,RESN');
 set_gedcom_setting($ged_id, 'FAM_FACTS_QUICK',              'MARR,DIV,_NMR');
 set_gedcom_setting($ged_id, 'FAM_FACTS_UNIQUE',             'NCHI,MARL,DIV,ANUL,DIVF,ENGA,MARB,MARC,MARS');
 set_gedcom_setting($ged_id, 'FAM_ID_PREFIX',                'F');
@@ -60,7 +60,7 @@ set_gedcom_setting($ged_id, 'GEDCOM_ID_PREFIX',             'I');
 set_gedcom_setting($ged_id, 'GENERATE_UIDS',                false);
 set_gedcom_setting($ged_id, 'HIDE_GEDCOM_ERRORS',           true);
 set_gedcom_setting($ged_id, 'HIDE_LIVE_PEOPLE',             true);
-set_gedcom_setting($ged_id, 'INDI_FACTS_ADD',               'ADDR,AFN,BIRT,CHR,DEAT,BURI,CREM,ADOP,BAPM,BARM,BASM,BLES,CHRA,CONF,EMAIL,FAX,FCOM,ORDN,NATU,EMIG,IMMI,CENS,PROB,WILL,GRAD,RETI,CAST,DSCR,EDUC,IDNO,NATI,NCHI,NMR,OCCU,PROP,RELI,RESI,SSN,TITL,BAPL,CONL,ENDL,SLGC,_MILI,ASSO');
+set_gedcom_setting($ged_id, 'INDI_FACTS_ADD',               'ADDR,AFN,BIRT,CHR,DEAT,BURI,CREM,ADOP,BAPM,BARM,BASM,BLES,CHRA,CONF,EMAIL,FAX,FCOM,ORDN,NATU,EMIG,IMMI,CENS,PROB,WILL,GRAD,RETI,CAST,DSCR,EDUC,IDNO,NATI,NCHI,NMR,OCCU,PROP,RELI,RESI,SSN,TITL,BAPL,CONL,ENDL,SLGC,_MILI,ASSO,RESN');
 set_gedcom_setting($ged_id, 'INDI_FACTS_QUICK',             'BIRT,BURI,CHR,CENS,DEAT,OCCU,RESI');
 set_gedcom_setting($ged_id, 'INDI_FACTS_UNIQUE',            '');
 set_gedcom_setting($ged_id, 'KEEP_ALIVE_YEARS_BIRTH',       '');
@@ -79,7 +79,7 @@ set_gedcom_setting($ged_id, 'MEDIA_ID_PREFIX',              'M');
 set_gedcom_setting($ged_id, 'MEDIA_UPLOAD',                 WT_PRIV_USER); 
 set_gedcom_setting($ged_id, 'META_DESCRIPTION',             '');
 set_gedcom_setting($ged_id, 'META_TITLE',                   WT_WEBTREES);
-set_gedcom_setting($ged_id, 'NOTE_FACTS_ADD',               'SOUR');
+set_gedcom_setting($ged_id, 'NOTE_FACTS_ADD',               'SOUR,RESN');
 set_gedcom_setting($ged_id, 'NOTE_FACTS_QUICK',             '');
 set_gedcom_setting($ged_id, 'NOTE_FACTS_UNIQUE',            '');
 set_gedcom_setting($ged_id, 'NOTE_ID_PREFIX',               'N');
@@ -92,7 +92,7 @@ set_gedcom_setting($ged_id, 'POSTAL_CODE',                  true);
 set_gedcom_setting($ged_id, 'PREFER_LEVEL2_SOURCES',        '1');
 set_gedcom_setting($ged_id, 'QUICK_REQUIRED_FACTS',         'BIRT,DEAT');
 set_gedcom_setting($ged_id, 'QUICK_REQUIRED_FAMFACTS',      'MARR');
-set_gedcom_setting($ged_id, 'REPO_FACTS_ADD',               'PHON,EMAIL,FAX,WWW,NOTE,SHARED_NOTE');
+set_gedcom_setting($ged_id, 'REPO_FACTS_ADD',               'PHON,EMAIL,FAX,WWW,NOTE,SHARED_NOTE,RESN');
 set_gedcom_setting($ged_id, 'REPO_FACTS_QUICK',             '');
 set_gedcom_setting($ged_id, 'REPO_FACTS_UNIQUE',            'NAME,ADDR');
 set_gedcom_setting($ged_id, 'REPO_ID_PREFIX',               'R');
@@ -122,7 +122,7 @@ set_gedcom_setting($ged_id, 'SHOW_REGISTER_CAUTION',        true);
 set_gedcom_setting($ged_id, 'SHOW_RELATIVES_EVENTS',        '_BIRT_CHIL,_BIRT_SIBL,_MARR_CHIL,_MARR_PARE,_DEAT_CHIL,_DEAT_PARE,_DEAT_GPAR,_DEAT_SIBL,_DEAT_SPOU');
 set_gedcom_setting($ged_id, 'SHOW_STATS',                   false);
 set_gedcom_setting($ged_id, 'SOURCE_ID_PREFIX',             'S');
-set_gedcom_setting($ged_id, 'SOUR_FACTS_ADD',               'NOTE,REPO,SHARED_NOTE');
+set_gedcom_setting($ged_id, 'SOUR_FACTS_ADD',               'NOTE,REPO,SHARED_NOTE,RESN');
 set_gedcom_setting($ged_id, 'SOUR_FACTS_QUICK',             'TEXT,NOTE,REPO');
 set_gedcom_setting($ged_id, 'SOUR_FACTS_UNIQUE',            'AUTH,ABBR,TITL,PUBL,TEXT');
 set_gedcom_setting($ged_id, 'SUBLIST_TRIGGER_F',            '200');