Skip to content

Commit 0b369e1

Browse files
committed
Merge branch '7.0' of git://github.com/thecodingmachine/mvc.splash-common into 7.0
2 parents 62b9aa6 + 0b0d125 commit 0b369e1

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

src/Mouf/Mvc/Splash/Services/SplashRequestParameterFetcher.php

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,21 @@ public function fetchValue(SplashRequestContext $context)
6060
{
6161
$request = $context->getRequest();
6262
$postVals = $request->getParsedBody();
63-
$getVals = $request->getQueryParams();
6463
$value = null;
6564
if (isset($postVals[$this->key])) {
6665
$value = $postVals[$this->key];
6766
}
68-
else if (isset($getVals[$this->key])) {
69-
$value = $getVals[$this->key];
67+
else
68+
{
69+
$getVals = $request->getQueryParams();
70+
if (isset($getVals[$this->key])) {
71+
$value = $getVals[$this->key];
72+
} else {
73+
$uploadedFiles = $request->getUploadedFiles();
74+
if (isset($uploadedFiles[$this->key])) {
75+
$value = $uploadedFiles[$this->key];
76+
}
77+
}
7078
}
7179
if ($value !== null) {
7280
return $value;

0 commit comments

Comments
 (0)