Merge pull request #17853 from nextcloud/backport/17830/stable15

blizzz · web-flow · commit aa79f599e31f · 2019-11-08T09:32:02.000+01:00
[stable15] actually return the quote when getting global storage info
diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php
@@ -611,8 +611,13 @@ private static function getGlobalStorageInfo() {
 			$relative = 0;
 		}
 
-		return array('free' => $free, 'used' => $used, 'total' => $total, 'relative' => $relative);
-
+		return [
+			'free' => $free,
+			'used' => $used,
+			'total' => $total,
+			'relative' => $relative,
+			'quota' => $quota
+		];
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -611,8 +611,13 @@ private static function getGlobalStorageInfo() {`
`611`	`611`	`$relative = 0;`
`612`	`612`	`}`
`613`	`613`
`614`		`- return array('free' => $free, 'used' => $used, 'total' => $total, 'relative' => $relative);`
`615`		`-`
	`614`	`+ return [`
	`615`	`+ 'free' => $free,`
	`616`	`+ 'used' => $used,`
	`617`	`+ 'total' => $total,`
	`618`	`+ 'relative' => $relative,`
	`619`	`+ 'quota' => $quota`
	`620`	`+ ];`
`616`	`621`	`}`
`617`	`622`
`618`	`623`	`/**`