extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 03:13:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Fix missing quote when updating shares with VFS changes

Browse Source 
- Fix user delete entry search for single user
This commit is contained in:
nathangray 2021-02-16 11:53:32 -07:00
parent 18b7d9311c
commit 4b6551c5a3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/inc/class.admin_account.inc.php
View File

@ -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
{

2
api/src/Vfs/Sharing.php
View File

@ -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)
{