diff options
Diffstat (limited to 'admin_site_merge.php')
| -rw-r--r-- | admin_site_merge.php | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/admin_site_merge.php b/admin_site_merge.php index 4ec5d9efcb..e7be4fb258 100644 --- a/admin_site_merge.php +++ b/admin_site_merge.php @@ -24,6 +24,8 @@ namespace Fisharebest\Webtrees; global $WT_TREE; use Fisharebest\Webtrees\Controller\PageController; +use Fisharebest\Webtrees\Functions\FunctionsDb; +use Fisharebest\Webtrees\Functions\FunctionsPrint; define('WT_SCRIPT_NAME', 'admin_site_merge.php'); require './includes/session.php'; @@ -91,7 +93,7 @@ foreach ($facts1 as $id1 => $fact1) { } if ($rec1 && $rec2 && $rec1->getXref() !== $rec2->getXref() && $rec1::RECORD_TYPE === $rec2::RECORD_TYPE && Filter::post('action') === 'merge' && Filter::checkCsrf()) { - $ids = fetch_all_links($gid2, $WT_TREE->getTreeId()); + $ids = FunctionsDb::fetchAllLinks($gid2, $WT_TREE->getTreeId()); // If we are not auto-accepting, then we can show a link to the pending deletion if (Auth::user()->getPreference('auto_accept')) { @@ -161,7 +163,7 @@ if ($rec1 && $rec2 && $rec1->getXref() !== $rec2->getXref() && $rec1::RECORD_TYP $rec1->updateRecord($gedcom, true); $rec2->deleteRecord(); - update_favorites($gid2, $gid1, $WT_TREE); + FunctionsDb::updateFavorites($gid2, $gid1, $WT_TREE); FlashMessages::addMessage(I18N::translate( /* I18N: Records are individuals, sources, etc. */ 'The records “%1$s” and “%2$s” have been merged.', @@ -354,12 +356,12 @@ $controller->pageHeader(); </div> <div class="col-sm-9"> <input data-autocomplete-type="IFSRO" type="text" name="gid1" id="gid1" maxlength="20" value="<?php echo $gid1; ?>"> - <?php echo print_findindi_link('gid1'); ?> - <?php echo print_findfamily_link('gid1'); ?> - <?php echo print_findsource_link('gid1'); ?> - <?php echo print_findrepository_link('gid1'); ?> - <?php echo print_findmedia_link('gid1'); ?> - <?php echo print_findnote_link('gid1'); ?> + <?php echo FunctionsPrint::printFindIndividualLink('gid1'); ?> + <?php echo FunctionsPrint::printFindFamilyLink('gid1'); ?> + <?php echo FunctionsPrint::printFindSourceLink('gid1'); ?> + <?php echo FunctionsPrint::printFindRepositoryLink('gid1'); ?> + <?php echo FunctionsPrint::printFindMediaLink('gid1'); ?> + <?php echo FunctionsPrint::printFindNoteLink('gid1'); ?> </div> </div> @@ -371,12 +373,12 @@ $controller->pageHeader(); </div> <div class="col-sm-9"> <input data-autocomplete-type="IFSRO" type="text" name="gid2" id="gid2" maxlength="20" value="<?php echo $gid2; ?>" > - <?php echo print_findindi_link('gid2'); ?> - <?php echo print_findfamily_link('gid2'); ?> - <?php echo print_findsource_link('gid2'); ?> - <?php echo print_findrepository_link('gid2'); ?> - <?php echo print_findmedia_link('gid2'); ?> - <?php echo print_findnote_link('gid2'); ?> + <?php echo FunctionsPrint::printFindIndividualLink('gid2'); ?> + <?php echo FunctionsPrint::printFindFamilyLink('gid2'); ?> + <?php echo FunctionsPrint::printFindSourceLink('gid2'); ?> + <?php echo FunctionsPrint::printFindRepositoryLink('gid2'); ?> + <?php echo FunctionsPrint::printFindMediaLink('gid2'); ?> + <?php echo FunctionsPrint::printFindNoteLink('gid2'); ?> </div> </div> |