fix quota calculation for trash and versions
fix type in var name
Merge pull request #2070 from owncloud/fix_quota

fix quota calculation for trash and versions