Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/23'
Browse files Browse the repository at this point in the history
Close #24
Fixes #23
  • Loading branch information
weierophinney committed Feb 8, 2016
2 parents 9485d52 + e032d48 commit 202014e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

All notable changes to this project will be documented in this file, in reverse chronological order by release.

## 2.6.1 - TBD
## 2.6.1 - 2016-02-08

### Added

Expand All @@ -18,7 +18,9 @@ All notable changes to this project will be documented in this file, in reverse

### Fixed

- Nothing.
- [#24](https://github.com/zendframework/zend-filter/pull/24) updates the
`FilterPluginManager` to reference the `NumberFormat` **filter**, instead of
the **view helper**.

## 2.6.0 - 2016-02-04

Expand Down
4 changes: 2 additions & 2 deletions src/FilterPluginManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
use Zend\Filter\Exception\RuntimeException;
use Zend\I18n\Filter\Alnum;
use Zend\I18n\Filter\Alpha;
use Zend\I18n\Filter\NumberFormat;
use Zend\I18n\Filter\NumberParse;
use Zend\I18n\View\Helper\NumberFormat;
use Zend\ServiceManager\AbstractPluginManager;
use Zend\ServiceManager\Exception\InvalidServiceException;
use Zend\ServiceManager\Factory\InvokableFactory;
Expand Down Expand Up @@ -260,7 +260,7 @@ class FilterPluginManager extends AbstractPluginManager
'zendfiltertonull' => InvokableFactory::class,
'zendi18nfilteralnum' => InvokableFactory::class,
'zendi18nfilteralpha' => InvokableFactory::class,
'zendi18nviewhelpernumberformat' => InvokableFactory::class,
'zendi18nfilternumberformat' => InvokableFactory::class,
'zendi18nfilternumberparse' => InvokableFactory::class,
'zendfilterbasename' => InvokableFactory::class,
'zendfilterblacklist' => InvokableFactory::class,
Expand Down

0 comments on commit 202014e

Please sign in to comment.