fixing errors regarding wrong function calls / missing parameters
This commit is contained in:
parent
f3c6546d5b
commit
780280e53f
|
@ -81,7 +81,7 @@ class OC_Helper {
|
||||||
* Returns a absolute url to the given app and file.
|
* Returns a absolute url to the given app and file.
|
||||||
*/
|
*/
|
||||||
public static function makeURLAbsolute($url) {
|
public static function makeURLAbsolute($url) {
|
||||||
return OC::$server->getURLGenerator()->makeURLAbsolute($url);
|
return OC::$server->getURLGenerator()->getAbsoluteURL($url);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -34,7 +34,6 @@ class Server extends SimpleContainer implements IServerContainer {
|
||||||
$requesttoken = false;
|
$requesttoken = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return new Request(
|
return new Request(
|
||||||
array(
|
array(
|
||||||
'get' => $_GET,
|
'get' => $_GET,
|
||||||
|
@ -46,7 +45,6 @@ class Server extends SimpleContainer implements IServerContainer {
|
||||||
'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
|
'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
|
||||||
? $_SERVER['REQUEST_METHOD']
|
? $_SERVER['REQUEST_METHOD']
|
||||||
: null,
|
: null,
|
||||||
'params' => $params,
|
|
||||||
'urlParams' => $urlParams,
|
'urlParams' => $urlParams,
|
||||||
'requesttoken' => $requesttoken,
|
'requesttoken' => $requesttoken,
|
||||||
)
|
)
|
||||||
|
@ -290,4 +288,5 @@ class Server extends SimpleContainer implements IServerContainer {
|
||||||
function getDatabaseConnection() {
|
function getDatabaseConnection() {
|
||||||
return \OC_DB::getConnection();
|
return \OC_DB::getConnection();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue