Use server container

remotes/origin/fix-10825
Lukas Reschke 12 years ago
parent 048139074d
commit d197f43475
  1. 2
      lib/private/appframework/app.php
  2. 9
      lib/private/server.php
  3. 7
      lib/public/iservercontainer.php

@ -69,7 +69,7 @@ class App {
if($value['expireDate'] instanceof \DateTime) {
$expireDate = $value['expireDate']->getTimestamp();
}
setcookie($name, $value['value'], $expireDate, \OC::$WEBROOT, null, \OC::$server->getConfig()->getSystemValue('forcessl', false), true);
setcookie($name, $value['value'], $expireDate, $container->getServer()->getWebRoot(), null, $container->getServer()->getConfig()->getSystemValue('forcessl', false), true);
}
if(!is_null($output)) {

@ -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;
}
}

@ -298,4 +298,11 @@ interface IServerContainer {
* @return \OCP\App\IAppManager
*/
function getAppManager();
/**
* Get the webroot
*
* @return string
*/
function getWebRoot();
}

Loading…
Cancel
Save