Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
core
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
177
Issues
177
List
Boards
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
hubzilla
core
Commits
a26774b9
Commit
a26774b9
authored
Jun 14, 2019
by
Mario
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix mod cal regression
parent
92585937
Pipeline
#142669
passed with stage
in 11 minutes and 37 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
Zotlabs/Module/Cal.php
Zotlabs/Module/Cal.php
+1
-2
No files found.
Zotlabs/Module/Cal.php
View file @
a26774b9
...
...
@@ -233,13 +233,12 @@ class Cal extends \Zotlabs\Web\Controller {
where item.resource_type = 'event' and event.uid = %d and event.uid = item.uid
$ignored
AND (( event.adjust = 0 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' )
OR ( event.adjust = 1 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' )) "
,
intval
(
local_channel
()
),
intval
(
$channel
[
'channel_id'
]
),
dbesc
(
$start
),
dbesc
(
$finish
),
dbesc
(
$adjust_start
),
dbesc
(
$adjust_finish
)
);
}
$links
=
array
();
...
...
Mario
@mario
mentioned in commit
c5703306
·
Jun 14, 2019
mentioned in commit
c5703306
mentioned in commit c5703306ef7eeca1a65ba7315881f3b583c5a535
Toggle commit list
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