diff options
Diffstat (limited to 'admin_trees_merge.php')
| -rw-r--r-- | admin_trees_merge.php | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/admin_trees_merge.php b/admin_trees_merge.php index 62f9dadfce..89a545c98f 100644 --- a/admin_trees_merge.php +++ b/admin_trees_merge.php @@ -2,7 +2,7 @@ // Merge two trees, by copying the records from one into another. // // webtrees: Web based Family History software -// Copyright (C) 2014 Greg Roach +// Copyright (C) 2015 Greg Roach // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -30,7 +30,14 @@ $controller ->setPageTitle(WT_I18N::translate('Merge family trees')) ->pageHeader(); -echo '<h2>', $controller->getPageTitle(), '</h2>'; +?> +<ol class="breadcrumb small"> + <li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li> + <li><a href="admin_trees_manage.php"><?php echo WT_I18N::translate('Manage family trees'); ?></a></li> + <li class="active"><?php echo $controller->getPageTitle(); ?></li> +</ol> +<h2><?php echo $controller->getPageTitle(); ?></h2> +<?php $tree1_id = WT_Filter::post('tree1_id'); $tree2_id = WT_Filter::post('tree2_id'); @@ -62,8 +69,8 @@ if ($tree1_id && $tree2_id != $tree1_id) { " SELECT o_id AS xref FROM `##other` WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')" . ") AS other_trees USING (xref)" )->execute(array( - $tree1_id, $tree1_id, $tree1_id, $tree1_id, $tree1_id, - $tree2_id, $tree2_id, $tree2_id, $tree2_id, $tree2_id, $tree2_id + $tree1_id, $tree1_id, $tree1_id, $tree1_id, $tree1_id, + $tree2_id, $tree2_id, $tree2_id, $tree2_id, $tree2_id, $tree2_id ))->fetchAssoc(); if ($xrefs) { @@ -74,7 +81,7 @@ if ($tree1_id && $tree2_id != $tree1_id) { '<p>', WT_I18N::plural( /* I18N: An XREF is the identification number used in GEDCOM files. */ - 'The two family trees have %1$s record which use the same “XREF”.', + 'The two family trees have %1$s record which uses the same “XREF”.', 'The two family trees have %1$s records which use the same “XREF”.', count($xrefs), count($xrefs) ), |