From 78893ad9015205cdad8eb64d67bcfe8bef04e829 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 11 Aug 2016 22:39:35 +0200 Subject: [PATCH] * Filemanager: fix PHP Fatal error when changing ownership or permissions --- api/src/Vfs/Sqlfs/StreamWrapper.php | 4 ++-- api/src/Vfs/StreamWrapper.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/Vfs/Sqlfs/StreamWrapper.php b/api/src/Vfs/Sqlfs/StreamWrapper.php index b87ac27754..75f44d363c 100644 --- a/api/src/Vfs/Sqlfs/StreamWrapper.php +++ b/api/src/Vfs/Sqlfs/StreamWrapper.php @@ -862,14 +862,14 @@ class StreamWrapper extends Api\Db\Pdo implements Vfs\StreamWrapperIface return $this->chmod($path, $value); case STREAM_META_OWNER_NAME: - if (($value = $GLOBALS['egw']->account->name2id($value, 'account_lid', 'u')) === false) + if (($value = $GLOBALS['egw']->accounts->name2id($value, 'account_lid', 'u')) === false) return false; // fall through case STREAM_META_OWNER: return $this->chown($path, $value); case STREAM_META_GROUP_NAME: - if (($value = $GLOBALS['egw']->account->name2id($value, 'account_lid', 'g')) === false) + if (($value = $GLOBALS['egw']->accounts->name2id($value, 'account_lid', 'g')) === false) return false; // fall through case STREAM_META_GROUP: diff --git a/api/src/Vfs/StreamWrapper.php b/api/src/Vfs/StreamWrapper.php index 6971e81a07..57eceaac24 100644 --- a/api/src/Vfs/StreamWrapper.php +++ b/api/src/Vfs/StreamWrapper.php @@ -507,14 +507,14 @@ class StreamWrapper implements StreamWrapperIface return chmod($url, $value); case STREAM_META_OWNER_NAME: - if (($value = $GLOBALS['egw']->account->name2id($value, 'account_lid', 'u')) === false) + if (($value = $GLOBALS['egw']->accounts->name2id($value, 'account_lid', 'u')) === false) return false; // fall through case STREAM_META_OWNER: return chown($url, $value); case STREAM_META_GROUP_NAME: - if (($value = $GLOBALS['egw']->account->name2id($value, 'account_lid', 'g')) === false) + if (($value = $GLOBALS['egw']->accounts->name2id($value, 'account_lid', 'g')) === false) return false; // fall through case STREAM_META_GROUP: