From 8d6a3a00b47aa7d034de378f498a7d5e329a8e1d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 3 Feb 2014 16:29:04 +0100 Subject: [PATCH] Revert "Use Cache->clear to cleanup the filecache for removed users" This reverts commit 5a5b6f187e719e6c0bac5e64c411eb74e6d28389. --- lib/private/user.php | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/private/user.php b/lib/private/user.php index 7932f4aef7..2519200d0f 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -205,13 +205,8 @@ class OC_User { // Delete user files in /data/ OC_Helper::rmdirr(\OC_User::getHome($uid)); - // Cleanup the filecache - $mount = \OC\Files\Filesystem::getMountByStorageId('home::' . $uid); - if (count($mount) > 0) { - $mount = $mount[0]; - $cache = $mount->getStorage()->getCache(); - $cache->clear(); - } + // Delete the users entry in the storage table + \OC\Files\Cache\Storage::remove('home::' . $uid); // Remove it from the Cache self::getManager()->delete($uid); @@ -248,15 +243,15 @@ class OC_User { $uid = $backend->getCurrentUserId(); $run = true; - OC_Hook::emit("OC_User", "pre_login", array("run" => &$run, "uid" => $uid)); + OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $uid )); - if ($uid) { + if($uid) { session_regenerate_id(true); self::setUserId($uid); self::setDisplayName($uid); self::getUserSession()->setLoginName($uid); - OC_Hook::emit("OC_User", "post_login", array("uid" => $uid, 'password' => '')); + OC_Hook::emit( "OC_User", "post_login", array( "uid" => $uid, 'password'=>'' )); return true; } return false;