Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'hotfix/3510' into develop

Close #3510
Fixes #3370
  • Loading branch information...
commit 2adf713dfb6192c286b570e63b004abdd897748d 2 parents aa22c2b + 0054079
@weierophinney weierophinney authored
Showing with 4 additions and 3 deletions.
  1. +4 −3 library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php
View
7 library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php
@@ -17,6 +17,7 @@
use Zend\InputFilter\InputFilterInterface;
use Zend\Mvc\Exception\RuntimeException;
use Zend\Session\Container;
+use Zend\Stdlib\ArrayUtils;
use Zend\Validator\ValidatorChain;
/**
@@ -80,7 +81,7 @@ function($input, $value) {
// Run the form validations/filters and retrieve any errors
$postFiles = $request->getFiles()->toArray();
$postOther = $request->getPost()->toArray();
- $post = array_merge($postOther, $postFiles);
+ $post = ArrayUtils::merge($postOther, $postFiles);
$form->setData($post);
$isValid = $form->isValid();
@@ -88,11 +89,11 @@ function($input, $value) {
$errors = (!$isValid) ? $form->getMessages() : null;
// Loop through data and merge previous files with new valid files
- $postFiles = array_merge(
+ $postFiles = ArrayUtils::merge(
$previousFiles,
$this->filterInvalidFileInputPostData($inputFilter, $data)
);
- $post = array_merge($post, $postFiles);
+ $post = ArrayUtils::merge($post, $postFiles);
// Save form data in session
$container->setExpirationHops(1, array('post', 'errors', 'isValid'));
Please sign in to comment.
Something went wrong with that request. Please try again.