upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge pull request #35335 from nextcloud/stable25-revert-34032-fix-quota-32bit

Browse source 
Revert "[stable25] Fix quota type to int"
This commit is contained in:
blizzz 2022-11-24 10:25:57 +01:00 committed by GitHub
commit 4c99ba4ad3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/private/legacy/OC_Helper.php
View file

@ -95,7 +95,7 @@ class OC_Helper {
/**
* Make a computer file size
* @param string $str file size in human readable format
* @return int|false a file size in bytes
* @return float|false a file size in bytes
*
* Makes 2kB to 2048.
*
@ -104,7 +104,7 @@ class OC_Helper {
public static function computerFileSize($str) {
$str = strtolower($str);
if (is_numeric($str)) {
return (int)$str;
return (float)$str;
}
$bytes_array = [
@ -131,7 +131,7 @@ class OC_Helper {
$bytes = round($bytes);
return (int)$bytes;
return $bytes;
}
/**
@ -577,7 +577,7 @@ class OC_Helper {
/**
* Get storage info including all mount points and quota
*/
private static function getGlobalStorageInfo(int $quota, IUser $user, IMountPoint $mount): array {
private static function getGlobalStorageInfo(float $quota, IUser $user, IMountPoint $mount): array {
$rootInfo = \OC\Files\Filesystem::getFileInfo('', 'ext');
$used = $rootInfo['size'];
if ($used < 0) {

2
lib/private/legacy/OC_Util.php
View file

@ -158,7 +158,7 @@ class OC_Util {
* Get the quota of a user
*
* @param IUser|null $user
* @return int|\OCP\Files\FileInfo::SPACE_UNLIMITED|false Quota bytes
* @return float|\OCP\Files\FileInfo::SPACE_UNLIMITED|false Quota bytes
*/
public static function getUserQuota(?IUser $user) {
if (is_null($user)) {