diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-05 13:00:50 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-05 13:00:50 +0200 |
| commit | f955209a5ab028a3cb68eb804323f08623099b03 (patch) | |
| tree | 5d25a0299056c6ac1fdb0be0760ed9c08c692bc6 | |
| parent | d0eb8f8668189d5fe82c9d783f30564d643ba604 (diff) | |
| parent | 6fcd135d0e871a918b2842647385b527cb823bb2 (diff) | |
| download | nextcloud-server-f955209a5ab028a3cb68eb804323f08623099b03.tar.gz nextcloud-server-f955209a5ab028a3cb68eb804323f08623099b03.zip | |
Merge pull request #8890 from owncloud/cleanup-trashsizes-table-master
table files_trashsizes was still used in some locations -> removed
| -rw-r--r-- | apps/files_trashbin/appinfo/database.xml | 26 | ||||
| -rw-r--r-- | 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 db104ee9298..a6ba242c1cf 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 a8e66b06bbd..1838c48d95d 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)); } /** |