Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
d197f434
Commit
d197f434
authored
Nov 27, 2014
by
Lukas Reschke
Browse files
Use server container
parent
04813907
Changes
3
Hide whitespace changes
Inline
Side-by-side
lib/private/appframework/app.php
View file @
d197f434
...
...
@@ -69,7 +69,7 @@ class App {
if
(
$value
[
'expireDate'
]
instanceof
\
DateTime
)
{
$expireDate
=
$value
[
'expireDate'
]
->
getTimestamp
();
}
setcookie
(
$name
,
$value
[
'value'
],
$expireDate
,
\
OC
::
$WEBROOT
,
null
,
\
OC
::
$s
erver
->
getConfig
()
->
getSystemValue
(
'forcessl'
,
false
),
true
);
setcookie
(
$name
,
$value
[
'value'
],
$expireDate
,
$container
->
getServer
()
->
getWebRoot
(),
null
,
$container
->
getS
erver
()
->
getConfig
()
->
getSystemValue
(
'forcessl'
,
false
),
true
);
}
if
(
!
is_null
(
$output
))
{
...
...
lib/private/server.php
View file @
d197f434
...
...
@@ -631,4 +631,13 @@ class Server extends SimpleContainer implements IServerContainer {
function
getAppManager
()
{
return
$this
->
query
(
'AppManager'
);
}
/**
* Get the webroot
*
* @return string
*/
function
getWebRoot
()
{
return
\
OC
::
$WEBROOT
;
}
}
lib/public/iservercontainer.php
View file @
d197f434
...
...
@@ -298,4 +298,11 @@ interface IServerContainer {
* @return \OCP\App\IAppManager
*/
function
getAppManager
();
/**
* Get the webroot
*
* @return string
*/
function
getWebRoot
();
}
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