From 4e24486a89088d0053633f1f91739649c4f4ffda Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 5 Jun 2015 11:31:49 +0200 Subject: Check whether the user exists before trying to set up his file system --- apps/files_trashbin/command/expire.php | 6 ++++++ apps/files_versions/command/expire.php | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/apps/files_trashbin/command/expire.php b/apps/files_trashbin/command/expire.php index e617fa47c90..e7dd5c573c2 100644 --- a/apps/files_trashbin/command/expire.php +++ b/apps/files_trashbin/command/expire.php @@ -49,6 +49,12 @@ class Expire implements ICommand { } public function handle() { + $userManager = \OC::$server->getUserManager(); + if (!$userManager->userExists($this->user)) { + // User has been deleted already + return; + } + \OC_Util::tearDownFS(); \OC_Util::setupFS($this->user); Trashbin::expire($this->trashBinSize, $this->user); diff --git a/apps/files_versions/command/expire.php b/apps/files_versions/command/expire.php index 6cec9f4fac3..ec9aa3e80d3 100644 --- a/apps/files_versions/command/expire.php +++ b/apps/files_versions/command/expire.php @@ -50,6 +50,12 @@ class Expire implements ICommand { public function handle() { + $userManager = \OC::$server->getUserManager(); + if (!$userManager->userExists($this->user)) { + // User has been deleted already + return; + } + \OC_Util::setupFS($this->user); Storage::expire($this->fileName, $this->versionsSize, $this->neededSpace); \OC_Util::tearDownFS(); -- cgit v1.2.3