Update StorageManager.php

This commit is contained in:
Carlos Ferreira 2018-03-13 01:32:08 +01:00 committed by GitHub
parent 60bb162ea4
commit 35217bd0e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -14,6 +14,7 @@ use humhub\modules\file\libs\FileHelper;
use Yii; use Yii;
use yii\base\Component; use yii\base\Component;
use yii\web\UploadedFile; use yii\web\UploadedFile;
use yii\helpers\FileHelper;
/** /**
* StorageManager for File records * StorageManager for File records
@ -85,7 +86,7 @@ class StorageManager extends Component implements StorageManagerInterface
* For uploaded jpeg files convert them again - to handle special * For uploaded jpeg files convert them again - to handle special
* exif attributes (e.g. orientation) * exif attributes (e.g. orientation)
*/ */
if ($file->type == 'image/jpeg') { if ($file->type === 'image/jpeg') {
ImageConverter::TransformToJpeg($this->get($variant), $this->get($variant)); ImageConverter::TransformToJpeg($this->get($variant), $this->get($variant));
} }
} }
@ -112,13 +113,13 @@ class StorageManager extends Component implements StorageManagerInterface
$files = glob($path . DIRECTORY_SEPARATOR . '*'); $files = glob($path . DIRECTORY_SEPARATOR . '*');
foreach ($files as $file) { foreach ($files as $file) {
if (is_file($file)) { if (is_file($file)) {
unlink($file); FileHelper::unlink($file);
} }
} }
FileHelper::removeDirectory($path); FileHelper::removeDirectory($path);
} }
} elseif (is_file($this->get($variant))) { } elseif (is_file($this->get($variant))) {
unlink($this->get($variant)); FileHelper::unlink($this->get($variant));
} }
} }