Skip to content

Commit

Permalink
Merge branch '2.0.x' of https://github.com/phalcon/cphalcon into 2.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
andresgutierrez committed Jul 21, 2015
2 parents b33b4a6 + 01267f2 commit 314fd32
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- Added `\Phalcon\Mvc\Model\MetaData\Redis` adapter.
- Added Redis Session adapter
- Fixed bug in Mvc\Model\Criteria::fromInput unallowing it to use renamed columns
- Fixed bug in `Http\Request` getRawBody()/getPut() clears input buffer [#10694](https://github.com/phalcon/cphalcon/issues/10694)

# [2.0.5](https://github.com/phalcon/cphalcon/releases/tag/phalcon-v2.0.5) (2015-07-14)
- Fixed a bug that makes that attaching an events manager to an Mvc\Application causes view->render() not being called
Expand Down
2 changes: 1 addition & 1 deletion phalcon/http/request.zep
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class Request implements RequestInterface, InjectionAwareInterface

if typeof put != "array" {
let put = [];
parse_str(file_get_contents("php://input"), put);
parse_str(this->getRawBody(), put);

let this->_putCache = put;
}
Expand Down

0 comments on commit 314fd32

Please sign in to comment.