From fd9a07b51e3c36eb968c02dbe8d79585b5333c83 Mon Sep 17 00:00:00 2001 From: Alex <40072887+alexdcrane@users.noreply.github.com> Date: Wed, 22 Oct 2025 10:22:51 -0700 Subject: [PATCH] Fix databases copy and delete (#7589) --- core/databases/databases.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/core/databases/databases.php b/core/databases/databases.php index 344dbedb40..1b0af8c379 100644 --- a/core/databases/databases.php +++ b/core/databases/databases.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2020 + Portions created by the Initial Developer are Copyright (C) 2008-2025 the Initial Developer. All Rights Reserved. Contributor(s): @@ -56,12 +56,14 @@ switch ($action) { case 'copy': if (permission_exists('database_add')) { - $database->copy($databases); + $obj = new databases; + $obj->copy($databases); } break; case 'delete': if (permission_exists('database_delete')) { - $database->delete($databases); + $obj = new databases; + $obj->delete($databases); } break; } @@ -109,11 +111,9 @@ } if (permission_exists('database_add') && $databases) { echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$settings->get('theme', 'button_icon_copy'),'id'=>'btn_copy','name'=>'btn_copy','style'=>'display: none;','onclick'=>"modal_open('modal-copy','btn_copy');"]); - echo modal::create(['id'=>'modal-copy','type'=>'copy','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_copy','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('copy'); list_form_submit('form_list');"])]); } if (permission_exists('database_delete') && $databases) { echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$settings->get('theme', 'button_icon_delete'),'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); - echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('delete'); list_form_submit('form_list');"])]); } echo " \n"; echo "
\n"; @@ -195,4 +195,3 @@ require_once "resources/footer.php"; ?> -