From 6fcd135d0e871a918b2842647385b527cb823bb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 5 Jun 2014 10:44:32 +0200
Subject: [PATCH] table files_trashsizes was still used in some locations ->
removed
---
apps/files_trashbin/appinfo/database.xml | 26 ------------------------
apps/files_trashbin/lib/trashbin.php | 9 ++------
2 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/apps/files_trashbin/appinfo/database.xml b/apps/files_trashbin/appinfo/database.xml
index db104ee929..a6ba242c1c 100644
--- a/apps/files_trashbin/appinfo/database.xml
+++ b/apps/files_trashbin/appinfo/database.xml
@@ -89,30 +89,4 @@
</table>
- <table>
-
- <name>*dbprefix*files_trashsize</name>
-
- <declaration>
-
- <field>
- <name>user</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>64</length>
- </field>
-
- <field>
- <name>size</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>50</length>
- </field>
-
- </declaration>
-
- </table>
-
</database>
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index a8e66b06bb..1838c48d95 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -655,17 +655,12 @@ class Trashbin {
/**
* deletes used space for trash bin in db if user was deleted
*
- * @param type $uid id of deleted user
+ * @param string $uid id of deleted user
* @return bool result of db delete operation
*/
public static function deleteUser($uid) {
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=?');
- $result = $query->execute(array($uid));
- if ($result) {
- $query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trashsize` WHERE `user`=?');
- return $query->execute(array($uid));
- }
- return false;
+ return $query->execute(array($uid));
}
/**
--
GitLab