Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
c8a9ed80
Commit
c8a9ed80
authored
Jan 26, 2014
by
Vladimir Zbrailov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
prevent changing public timezone
parent
230f40c8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
4 deletions
+9
-4
Formatter.php
framework/base/Formatter.php
+9
-4
No files found.
framework/base/Formatter.php
View file @
c8a9ed80
...
@@ -69,6 +69,11 @@ class Formatter extends Component
...
@@ -69,6 +69,11 @@ class Formatter extends Component
public
$thousandSeparator
;
public
$thousandSeparator
;
/**
/**
* @var \DateTimeZone
*/
private
$_timeZone
;
/**
* Initializes the component.
* Initializes the component.
*/
*/
public
function
init
()
public
function
init
()
...
@@ -77,9 +82,9 @@ class Formatter extends Component
...
@@ -77,9 +82,9 @@ class Formatter extends Component
$this
->
timeZone
=
Yii
::
$app
->
timeZone
;
$this
->
timeZone
=
Yii
::
$app
->
timeZone
;
}
}
if
(
is_string
(
$this
->
timeZone
))
{
if
(
is_string
(
$this
->
timeZone
))
{
$this
->
timeZone
=
new
\DateTimeZone
(
$this
->
timeZone
);
$this
->
_
timeZone
=
new
\DateTimeZone
(
$this
->
timeZone
);
}
elseif
(
$this
->
timeZone
instanceof
IntlTimeZone
)
{
}
elseif
(
$this
->
_
timeZone
instanceof
IntlTimeZone
)
{
$this
->
timeZone
=
$this
->
timeZone
->
toDateTimeZone
();
$this
->
_
timeZone
=
$this
->
timeZone
->
toDateTimeZone
();
}
}
if
(
empty
(
$this
->
booleanFormat
))
{
if
(
empty
(
$this
->
booleanFormat
))
{
...
@@ -351,7 +356,7 @@ class Formatter extends Component
...
@@ -351,7 +356,7 @@ class Formatter extends Component
{
{
$date
=
new
DateTime
();
$date
=
new
DateTime
();
$date
->
setTimestamp
(
$value
);
$date
->
setTimestamp
(
$value
);
$date
->
setTimezone
(
$this
->
timeZone
);
$date
->
setTimezone
(
$this
->
_
timeZone
);
return
$date
->
format
(
$format
);
return
$date
->
format
(
$format
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment