eessppeelllloo/grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-12-05 15:29:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add FormFlash::clearFiles() method

Browse Source
This commit is contained in:
Matias Griese
2019-01-22 09:29:54 +02:00
parent 52c7d8dfb7
commit 243055289b
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php
View File

@@ -229,7 +229,7 @@ trait FlexMediaTrait
$preg_name = preg_quote($fileParts['filename'], '`'); $preg_name = preg_quote($fileParts['filename'], '`');
$preg_ext =preg_quote($fileParts['extension'], '`'); $preg_ext =preg_quote($fileParts['extension'], '`');
$preg_filename = preg_quote($basename, '`'); $preg_filename = preg_quote($basename, '`');
echo $file .' - ';
if (preg_match("`({$preg_name}@\d+x\.{$preg_ext}(?:\.meta\.yaml)?$|{$preg_filename}\.meta\.yaml)$`", $file)) { if (preg_match("`({$preg_name}@\d+x\.{$preg_ext}(?:\.meta\.yaml)?$|{$preg_filename}\.meta\.yaml)$`", $file)) {
$testPath = $targetPath . '/' . $file; $testPath = $targetPath . '/' . $file;
if ($locator->isStream($testPath)) { if ($locator->isStream($testPath)) {

14
system/src/Grav/Framework/Form/FormFlash.php
View File

@@ -315,6 +315,20 @@ class FormFlash implements \JsonSerializable
return true; return true;
} }
/**
* Clear form flash from all uploaded files.
*/
public function clearFiles()
{
foreach ($this->files as $field => $files) {
foreach ($files as $name => $upload) {
$this->removeTmpFile($upload['tmp_name'] ?? '');
}
}
$this->files = [];
}
/** /**
* @return array * @return array
*/ */