Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
5c9a6ccb
Commit
5c9a6ccb
authored
Nov 12, 2014
by
Robert Lyon
Committed by
Gerrit Code Review
Nov 12, 2014
Browse files
Merge "Cookie lacking "secure" flag for HTTPS sites (Bug #1384009)"
parents
aca61905
dfbb1197
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/lib/web.php
View file @
5c9a6ccb
...
...
@@ -1644,7 +1644,7 @@ function set_cookie($name, $value='', $expires=0, $access=false) {
// If Cookie Consent is enabled with cc_necessary cookie set to 'yes'
// or Cookie Consent is not enabled
if
(
empty
(
$_COOKIE
[
'cc_necessary'
])
||
(
isset
(
$_COOKIE
[
'cc_necessary'
])
&&
$_COOKIE
[
'cc_necessary'
]
==
'yes'
))
{
setcookie
(
$name
,
$value
,
$expires
,
$url
[
'path'
],
$domain
,
false
,
true
);
setcookie
(
$name
,
$value
,
$expires
,
$url
[
'path'
],
$domain
,
is_https
()
,
true
);
}
if
(
$access
)
{
// View access cookies may be needed on this request
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment