From 2629b5200a17cd98a955d03a7e2831b71849f345 Mon Sep 17 00:00:00 2001 From: githubjeka Date: Wed, 22 Mar 2017 08:14:06 +0300 Subject: [PATCH] fixed `humhub/humhub/issues/2388` --- .../admin/controllers/SettingController.php | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/protected/humhub/modules/admin/controllers/SettingController.php b/protected/humhub/modules/admin/controllers/SettingController.php index 58e4fc45ff..803d00f0ee 100644 --- a/protected/humhub/modules/admin/controllers/SettingController.php +++ b/protected/humhub/modules/admin/controllers/SettingController.php @@ -8,6 +8,7 @@ namespace humhub\modules\admin\controllers; +use humhub\libs\Helpers; use Yii; use humhub\libs\ThemeHelper; use humhub\models\UrlOembed; @@ -185,10 +186,10 @@ class SettingController extends Controller } // Determine PHP Upload Max FileSize - $maxUploadSize = \humhub\libs\Helpers::GetBytesOfPHPIniValue(ini_get('upload_max_filesize')); + $maxUploadSize = Helpers::getBytesOfIniValue(ini_get('upload_max_filesize')); $fileSizeKey = 'upload_max_filesize'; - if ($maxUploadSize > \humhub\libs\Helpers::GetBytesOfPHPIniValue(ini_get('post_max_size'))) { - $maxUploadSize = \humhub\libs\Helpers::GetBytesOfPHPIniValue(ini_get('post_max_size')); + if ($maxUploadSize > Helpers::getBytesOfIniValue(ini_get('post_max_size'))) { + $maxUploadSize = Helpers::getBytesOfIniValue(ini_get('post_max_size')); $fileSizeKey = 'post_max_size'; } @@ -196,15 +197,20 @@ class SettingController extends Controller $maxUploadSizeText = "(" . $fileSizeKey . "): " . $maxUploadSize; // Determine currently used ImageLibary - $currentImageLibary = 'GD'; + $currentImageLibrary = 'GD'; if (Yii::$app->getModule('file')->settings->get('imageMagickPath')) { - $currentImageLibary = 'ImageMagick'; + $currentImageLibrary = 'ImageMagick'; } - return $this->render('file', ['model' => $form, - 'maxUploadSize' => $maxUploadSize, - 'maxUploadSizeText' => $maxUploadSizeText, - 'currentImageLibary' => $currentImageLibary]); + return $this->render( + 'file', + [ + 'model' => $form, + 'maxUploadSize' => $maxUploadSize, + 'maxUploadSizeText' => $maxUploadSizeText, + 'currentImageLibrary' => $currentImageLibrary, + ] + ); } /**