Skip to content

Commit

Permalink
merging master into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
nateiler committed Oct 15, 2019
1 parent 1c5bc10 commit ea27e82
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changelog
=========

## 2.5.2 - 2019-10-15
### Fixed
- `CheckAccessTrait::handleUnauthorizedResponse()` was passing the message and code incorrectly.

## 2.5.1 - 2019-10-03
### Fixed
- `ActiveQuery::andWhere()` would attempt to set query attribute values, however this resulted in some conditions never being set.
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "flipboxfactory/craft-ember",
"description": "A Craft CMS plugin scaffolding",
"version": "2.5.1",
"version": "2.5.2",
"keywords": [
"flipbox",
"ember",
Expand Down
4 changes: 2 additions & 2 deletions src/actions/CheckAccessTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ protected function messageUnauthorized(): string
protected function handleUnauthorizedResponse()
{
throw new UnauthorizedHttpException(
$this->statusCodeUnauthorized(),
$this->messageUnauthorized()
$this->messageUnauthorized(),
$this->statusCodeUnauthorized()
);
}
}

0 comments on commit ea27e82

Please sign in to comment.