Skip to content

Commit

Permalink
Merge branch 'version/bump'
Browse files Browse the repository at this point in the history
Bump to 2.2.5dev
  • Loading branch information
weierophinney committed Aug 26, 2013
2 parents 5b03d86 + 718f4cf commit 027de58
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
18 changes: 4 additions & 14 deletions README.md
Expand Up @@ -5,23 +5,13 @@ Develop: [![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?bra

## RELEASE INFORMATION

*Zend Framework 2.2.4*
*Zend Framework 2.2.5dev*

This is the fourth maintenance release for the 2.2 series.
This is the fifth maintenance release for the 2.2 series.

26 Aug 2013
DD MMM YYYY

### UPDATES IN 2.2.4

This release fixes a regression introduced in 2.2.3 to the Form component.

Basically, a fix included in 2.2.3 created a situation that enforced the
`preferFormInputFilter` flag; prior to 2.2.3, the code acted as if it the flag
was enabled, but as a side effect of several bugs.

2.2.4 enables the flag by default, which restores the previous behavior, while
retaining the fixes to 2.2.3. Additionally, the flag may now be set via form
options passed either to a factory or to the `setOptions()` method.
### UPDATES IN 2.2.5

Please see [CHANGELOG.md](CHANGELOG.md).

Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Version/Version.php
Expand Up @@ -19,7 +19,7 @@ final class Version
/**
* Zend Framework version identification - see compareVersion()
*/
const VERSION = '2.2.4';
const VERSION = '2.2.5dev';

/**
* Github Service Identifier for version information is retreived from
Expand Down

0 comments on commit 027de58

Please sign in to comment.