diff options
| -rw-r--r-- | admin_trees_manage.php | 14 | ||||
| -rw-r--r-- | library/WT/Tree.php | 5 |
2 files changed, 8 insertions, 11 deletions
diff --git a/admin_trees_manage.php b/admin_trees_manage.php index 76612a45ee..1d308d98e6 100644 --- a/admin_trees_manage.php +++ b/admin_trees_manage.php @@ -95,14 +95,14 @@ case 'delete': WT_Tree::get($gedcom_id)->delete(); } header('Location: ' . WT_SERVER_NAME . WT_SCRIPT_PATH . WT_SCRIPT_NAME); - + return; case 'setdefault': if (WT_Filter::checkCsrf()) { WT_Site::setPreference('DEFAULT_GEDCOM', WT_Filter::post('ged')); } header('Location: ' . WT_SERVER_NAME . WT_SCRIPT_PATH . WT_SCRIPT_NAME); - + return; case 'new_tree': $tree_name = basename(WT_Filter::post('tree_name')); @@ -112,7 +112,7 @@ case 'new_tree': WT_Tree::create($tree_name, $tree_title); } header('Location: ' . WT_SERVER_NAME . WT_SCRIPT_PATH . WT_SCRIPT_NAME . '?ged=' . $tree_name); - + return; case 'replace_upload': $gedcom_id = WT_Filter::postInteger('gedcom_id'); @@ -216,7 +216,7 @@ case 'importform': } else { echo '<p>', WT_I18N::translate('No GEDCOM files found. You need to copy files to the <b>%s</b> directory on your server.', WT_DATA_DIR); echo '</form>'; - + return; } } @@ -224,7 +224,7 @@ case 'importform': echo WT_I18N::translate('If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then check this box to merge the current media objects with the new GEDCOM file.'); echo '<br><br><input type="submit" value="', WT_I18N::translate('continue'), '">'; echo '</form>'; - + return; } @@ -532,13 +532,13 @@ case 'importform': <?php echo WT_Filter::getCsrf(); ?> <input type="hidden" name="action" value="new_tree"> <div class="form-group"> - <label for="ged_title" class="col-sm-2 control-label"> + <label for="tree_title" class="col-sm-2 control-label"> <?php echo WT_I18N::translate('Family tree title'); ?> </label> <div class="col-sm-10"> <input class="form-control" - id="ged_title" + id="tree_title" maxlength="255" name="tree_title" required diff --git a/library/WT/Tree.php b/library/WT/Tree.php index fd21f661a4..e814baca09 100644 --- a/library/WT/Tree.php +++ b/library/WT/Tree.php @@ -315,9 +315,6 @@ class WT_Tree { "INSERT INTO `##gedcom` (gedcom_name) VALUES (?)" )->execute(array($tree_name)); $tree_id = WT_DB::prepare("SELECT LAST_INSERT_ID()")->fetchOne(); - WT_DB::prepare( - "INSERT INTO `##gedcom_setting` (gedcom_id, setting_name) VALUES (?, ?)" - )->execute(array($tree_id, $tree_title)); } catch (PDOException $ex) { // A tree with that name already exists? return; @@ -441,7 +438,7 @@ class WT_Tree { $tree->setPreference('WEBTREES_EMAIL', ''); $tree->setPreference('WORD_WRAPPED_NOTES', '0'); $tree->setPreference('imported', '0'); - $tree->setPreference('title', /* I18N: Default title for new family trees */ WT_I18N::translate('My family tree')); + $tree->setPreference('title', $tree_title); // Default restriction settings $statement = WT_DB::prepare( |