Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.2.5] Phalcon\Logger\Adapter::setLogLevel() should be honored by transactions #1722

Merged
merged 6 commits into from Dec 20, 2013
Merged

[1.2.5] Phalcon\Logger\Adapter::setLogLevel() should be honored by transactions #1722

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ad87944
Backported test case for #1700
sjinks Dec 15, 2013
745dd47
Merge remote-tracking branch 'upstream/1.2.5' into 1.2.5
sjinks Dec 19, 2013
c0b69ac
Test case for #1716
sjinks Dec 20, 2013
d90dcb1
Fix #1716
sjinks Dec 20, 2013
3a6787f
Updated CHANGELOG
sjinks Dec 20, 2013
edb8295
Regenerated build/
sjinks Dec 20, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated CHANGELOG
  • Loading branch information
@sjinks
sjinks committed Dec 20, 2013
commit 3a6787f4e16cd3de52c57a35d00908a36f5bcc9b
2 changes: 2 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
- Bug fixes in beanstalkd protocol implementation
- Phalcon\Paginator\Adapter\Model returns correct results even when page number is incorrect (#1654)
- Bug fix: no arguments were passed to beforeMatch handler in Phalcon\Mvc\Router (#1556)
- Phalcon\Logger\Adapter::setLogLevel() is honored by transactions (#1716)
- Bug fixes in Phalcon\Db\Adapter\Pdo::describeColumns() (#1562)

1.2.4
- Fixed broken ACL inheritance (#905)
Expand Down