diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-07-09 15:58:09 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-07-09 15:58:09 +0000 |
| commit | 143c9c97b5d1cfaeaf29e345001dcdb30b114be6 (patch) | |
| tree | 5dc2ca92f9e7ac39af7ea27cead5d9c9cdda6326 /includes/functions/functions_db.php | |
| parent | b609d6ca5108261831fed60f7ca3351ef05461a6 (diff) | |
| download | webtrees-143c9c97b5d1cfaeaf29e345001dcdb30b114be6.tar.gz webtrees-143c9c97b5d1cfaeaf29e345001dcdb30b114be6.tar.bz2 webtrees-143c9c97b5d1cfaeaf29e345001dcdb30b114be6.zip | |
Fix: error when logging deletion of default gedcom
Diffstat (limited to 'includes/functions/functions_db.php')
| -rw-r--r-- | includes/functions/functions_db.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/includes/functions/functions_db.php b/includes/functions/functions_db.php index e089acb20f..0fcd1c5142 100644 --- a/includes/functions/functions_db.php +++ b/includes/functions/functions_db.php @@ -1628,6 +1628,10 @@ function find_rin_id($rin) { * @param string $ged the filename of the gedcom to delete */ function delete_gedcom($ged_id) { + // If this is the current default, then unset it + if (get_site_setting('DEFAULT_GEDCOM')==get_gedcom_from_id($ged_id)) { + set_site_setting('DEFAULT_GEDCOM', ''); + } // Don't delete the logs. WT_DB::prepare("UPDATE `##log` SET gedcom_id=NULL WHERE gedcom_id =?")->execute(array($ged_id)); @@ -1652,10 +1656,6 @@ function delete_gedcom($ged_id) { WT_DB::prepare("DELETE FROM `##change` WHERE gedcom_id =?")->execute(array($ged_id)); WT_DB::prepare("DELETE FROM `##default_resn` WHERE gedcom_id =?")->execute(array($ged_id)); WT_DB::prepare("DELETE FROM `##gedcom` WHERE gedcom_id =?")->execute(array($ged_id)); - - if (get_site_setting('DEFAULT_GEDCOM')==get_gedcom_from_id($ged_id)) { - set_site_setting('DEFAULT_GEDCOM', ''); - } } /** |