summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-02-14 19:12:13 +0100
committerFlorian Pritz <bluewind@xinu.at>2015-02-14 19:12:13 +0100
commitb8facbbd7a9a29c6274c435932b9c810155e2460 (patch)
treec87b80ad013c6368fea3484462db3f0f7a7b4601
parentbfbbf4082779a7535cac2fb270fd928178ae7e70 (diff)
Fix typo in error message
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--application/controllers/api/v1/file.php2
-rw-r--r--application/tests/test_api_v1.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/application/controllers/api/v1/file.php b/application/controllers/api/v1/file.php
index fc5565416..a10aaf63a 100644
--- a/application/controllers/api/v1/file.php
+++ b/application/controllers/api/v1/file.php
@@ -24,7 +24,7 @@ class file extends \controllers\api\api_controller {
$files = getNormalizedFILES();
if (empty($files)) {
- throw new \exceptions\PublicApiException("file/no-file", "No file was uploaded or unknown error occured.");
+ throw new \exceptions\PublicApiException("file/no-file", "No file was uploaded or unknown error occurred.");
}
\service\files::verify_uploaded_files($files);
diff --git a/application/tests/test_api_v1.php b/application/tests/test_api_v1.php
index bba0f9180..e179abc69 100644
--- a/application/tests/test_api_v1.php
+++ b/application/tests/test_api_v1.php
@@ -212,7 +212,7 @@ class test_api_v1 extends Test {
$this->t->is_deeply(array(
'status' => 'error',
'error_id' => 'file/no-file',
- 'message' => 'No file was uploaded or unknown error occured.',
+ 'message' => 'No file was uploaded or unknown error occurred.',
), $ret, "expected reply");
}