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

Commit

Permalink
Merge branch 'master' of git://github.com/zendframework/zf2
Browse files Browse the repository at this point in the history
  • Loading branch information
tr committed Aug 13, 2012
28 parents 639695d + 71b7690 + 95f6ca9 + 826a0e1 + 5998122 + 34263bb + 73b49a3 + a7937fe + 18bc286 + 7c2f341 + 3fd24f6 + 46b66eb + 5dc451e + 6cc63be + 36c3273 + d866e82 + 91a7d10 + d7310a9 + 024435b + 9d596bf + 205ad91 + 827e841 + aacf431 + 37d0971 + 4e0f2d8 + d00b2c8 + 2931e8c + 1592ea0 commit fead52a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion test/AttributeTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ protected function assertLocalDateTimeString($timestamp, $value)
{
$tsValue = date('YmdHisO', $timestamp);

if(date('O', strtotime('20120101'))) {
if (date('O', strtotime('20120101'))) {
// Local timezone is +0000 when DST is off. Zend_Ldap converts
// +0000 to "Z" (see Zend\Ldap\Converter\Converter:toLdapDateTime()), so
// take account of that here
Expand Down
2 changes: 1 addition & 1 deletion test/Node/OfflineTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ protected function assertLocalDateTimeString($timestamp, $value)
{
$tsValue = date('YmdHisO', $timestamp);

if(date('O', strtotime('20120101'))) {
if (date('O', strtotime('20120101'))) {
// Local timezone is +0000 when DST is off. Zend_Ldap converts
// +0000 to "Z" (see Zend\Ldap\Converter\Converter:toLdapDateTime()), so
// take account of that here
Expand Down

0 comments on commit fead52a

Please sign in to comment.