Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

This commit is contained in:
Dane Everitt 2017-11-05 12:43:03 -06:00
commit 4898d4f9d2
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
3 changed files with 3 additions and 3 deletions

View File

@ -69,7 +69,7 @@ class ScheduleCreationFormRequest extends ServerFormRequest
{
$restructured = [];
foreach (array_get($this->all(), 'tasks', []) as $key => $values) {
for ($i = 0; $i < count($values); ++$i) {
for ($i = 0; $i < count($values); $i++) {
$restructured[$i][$key] = $values[$i];
}
}

View File

@ -31,7 +31,7 @@ class MacroServiceProvider extends ServiceProvider
$i = 0;
while (($size / 1024) > 0.9) {
$size = $size / 1024;
++$i;
$i++;
}
return round($size, ($i < 2) ? 0 : $precision) . ' ' . $units[$i];

View File

@ -20,7 +20,7 @@ if (! function_exists('human_readable')) {
$i = 0;
while (($path / 1024) > 0.9) {
$path = $path / 1024;
++$i;
$i++;
}
return round($path, $precision) . ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'][$i];