Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
calendar-3428334
Manage
Activity
Members
Labels
Plan
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Issue forks
calendar-3428334
Commits
49b1586c
Commit
49b1586c
authored
16 years ago
by
Karen Stevenson
Browse files
Options
Downloads
Patches
Plain Diff
Critical bugfix, fix possible undefined $item->$tz.
parent
5f68c8b4
No related branches found
Branches containing commit
Tags
5.x-2.2
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.txt
+2
-0
2 additions, 0 deletions
CHANGELOG.txt
calendar.inc
+2
-2
2 additions, 2 deletions
calendar.inc
with
4 additions
and
2 deletions
CHANGELOG.txt
+
2
−
0
View file @
49b1586c
...
...
@@ -4,6 +4,8 @@ Views Calendar 5.x
Version 5.2 dev
===============
- Critical bugfix, fix possible undefined $item->$tz.
Version 5.2.1
===============
...
...
This diff is collapsed.
Click to expand it.
calendar.inc
+
2
−
2
View file @
49b1586c
...
...
@@ -585,8 +585,8 @@ function calendar_build_nodes(&$view, &$items) {
isset
(
$item
->
$fromto_alias
[
1
])
?
$item
->
$fromto_alias
[
1
]
:
$item
->
$fromto_alias
[
0
],
);
$db_tz
=
date_get_timezone_db
(
$tz_handling
,
$item
->
$tz_alias
);
$to_zone
=
date_get_timezone
(
$tz_handling
,
$item
->
$tz_alias
);
$db_tz
=
date_get_timezone_db
(
$tz_handling
,
isset
(
$item
->
$tz_alias
)
?
$item
->
$tz_alias
:
$display_timezone_name
)
;
$to_zone
=
date_get_timezone
(
$tz_handling
,
isset
(
$item
->
$tz_alias
)
?
$item
->
$tz_alias
:
$display_timezone_name
)
;
// NOTE: Now $display_timezone determines how $item is split
// into one entry per day, while $to_zone determines how date is displayed.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment