From 4b6551c5a3ab12d0a4b96812952107fb325d5a23 Mon Sep 17 00:00:00 2001 From: nathangray Date: Tue, 16 Feb 2021 11:53:32 -0700 Subject: [PATCH] - Fix missing quote when updating shares with VFS changes - Fix user delete entry search for single user --- admin/inc/class.admin_account.inc.php | 4 ++-- api/src/Vfs/Sharing.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/inc/class.admin_account.inc.php b/admin/inc/class.admin_account.inc.php index 41489b93f2..01367c0b88 100644 --- a/admin/inc/class.admin_account.inc.php +++ b/admin/inc/class.admin_account.inc.php @@ -331,7 +331,7 @@ class admin_account $msg = ''; if(count($content['account_id']) == 1) { - self::_deferred_delete($account_id, $content['new_owner'], $content['delete_apps'], $content['admin_cmd']); + self::_deferred_delete($content['account_id'][0], $content['new_owner'], $content['delete_apps'], $content['admin_cmd']); if ($content['contact_id']) { Framework::refresh_opener($msg, 'addressbook', $content['contact_id'], 'delete'); @@ -356,7 +356,7 @@ class admin_account // Get a count of entries owned by the user if(count($content['account_id']) == 1) { - $_counts = $GLOBALS['egw']->accounts->get_account_entry_counts($content['account_id']); + $_counts = $GLOBALS['egw']->accounts->get_account_entry_counts($content['account_id'][0]); } else { diff --git a/api/src/Vfs/Sharing.php b/api/src/Vfs/Sharing.php index edb3297c0a..09c83a2525 100644 --- a/api/src/Vfs/Sharing.php +++ b/api/src/Vfs/Sharing.php @@ -554,7 +554,7 @@ class Sharing extends \EGroupware\Api\Sharing 'share_id', 'share_path', 'share_owner' ), array( - "share_path LIKE '$path'" + "share_path LIKE " . $GLOBALS['egw']->db->quote($path) ), __LINE__, __FILE__, false) as $share) {