summaryrefslogtreecommitdiff
path: root/admin_trees_merge.php
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2015-02-06 16:32:26 +0000
committerGreg Roach <fisharebest@gmail.com>2015-02-06 16:32:26 +0000
commitd2cdeb3f83fe4c7421beb5f1ccb2e5e9e64ab477 (patch)
tree9279a16157bdcc356de976d03c517e045fa3f9ed /admin_trees_merge.php
parentb25d4f83710305793b098e86ca1f5d7b91c9d7b0 (diff)
downloadwebtrees-d2cdeb3f83fe4c7421beb5f1ccb2e5e9e64ab477.tar.gz
webtrees-d2cdeb3f83fe4c7421beb5f1ccb2e5e9e64ab477.tar.bz2
webtrees-d2cdeb3f83fe4c7421beb5f1ccb2e5e9e64ab477.zip
Rename function for consistency
Diffstat (limited to 'admin_trees_merge.php')
-rw-r--r--admin_trees_merge.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/admin_trees_merge.php b/admin_trees_merge.php
index 5b5c2a15eb..6e83f61eb7 100644
--- a/admin_trees_merge.php
+++ b/admin_trees_merge.php
@@ -71,8 +71,8 @@ if ($tree1_id && $tree2_id != $tree1_id) {
))->fetchAssoc();
if ($xrefs) {
- $tree1 = Tree::get($tree1_id);
- $tree2 = Tree::get($tree2_id);
+ $tree1 = Tree::findById($tree1_id);
+ $tree2 = Tree::findById($tree2_id);
echo
'<p>', I18N::translate('In a family tree, each record has an internal reference number (called an “XREF”) such as “F123” or “R14”.'), '</p>',
'<p>',