summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-02-14 19:13:59 +0100
committerFlorian Pritz <bluewind@xinu.at>2015-02-14 19:13:59 +0100
commit4f5f2f496bdc182ac9edeb2f416d12fa5e56a9ca (patch)
tree34c2af816b317742fb70edc1be2d0e9e5045ae3a
parentd7fc5f46a8b6faec4ec0c18089d94d21e505c36c (diff)
Use assoc array for service/files/verify_uploaded_files
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--application/service/files.php2
-rw-r--r--application/tests/test_service_files.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/application/service/files.php b/application/service/files.php
index 802ba70af..922320e11 100644
--- a/application/service/files.php
+++ b/application/service/files.php
@@ -125,7 +125,7 @@ class files {
}
if ($error_message != "") {
- $errors[] = array(
+ $errors[$file["formfield"]] = array(
"filename" => $file["name"],
"formfield" => $file["formfield"],
"message" => $error_message,
diff --git a/application/tests/test_service_files.php b/application/tests/test_service_files.php
index 3330e8c22..8789a9888 100644
--- a/application/tests/test_service_files.php
+++ b/application/tests/test_service_files.php
@@ -71,7 +71,7 @@ class test_service_files extends Test {
$data = $e->get_data();
$this->t->is($e->get_error_id(), "file/upload-verify", "verify should error");
$this->t->is_deeply(array(
- array(
+ 'file[1]' => array(
'filename' => 'foobar.txt',
'formfield' => 'file[1]',
'message' => 'No file was uploaded',