diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-07 00:35:05 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-07 00:35:05 +0200 |
| commit | 780280e53f162619ba513bed4e39dde6c0f591a2 (patch) | |
| tree | 162b56647e64f858ef39040116691551d89b3a70 /lib | |
| parent | f3c6546d5b6b84375ae18fb155de26303809498f (diff) | |
| download | nextcloud-server-780280e53f162619ba513bed4e39dde6c0f591a2.tar.gz nextcloud-server-780280e53f162619ba513bed4e39dde6c0f591a2.zip | |
fixing errors regarding wrong function calls / missing parameters
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/helper.php | 2 | ||||
| -rw-r--r-- | lib/private/server.php | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/private/helper.php b/lib/private/helper.php index a34640d8e36..f3f2ea9492a 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -81,7 +81,7 @@ class OC_Helper { * Returns a absolute url to the given app and file. */ public static function makeURLAbsolute($url) { - return OC::$server->getURLGenerator()->makeURLAbsolute($url); + return OC::$server->getURLGenerator()->getAbsoluteURL($url); } /** diff --git a/lib/private/server.php b/lib/private/server.php index 73a0cbd6ce6..e55f59f6a1c 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -34,7 +34,6 @@ class Server extends SimpleContainer implements IServerContainer { $requesttoken = false; } - return new Request( array( 'get' => $_GET, @@ -46,7 +45,6 @@ class Server extends SimpleContainer implements IServerContainer { 'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD'])) ? $_SERVER['REQUEST_METHOD'] : null, - 'params' => $params, 'urlParams' => $urlParams, 'requesttoken' => $requesttoken, ) @@ -290,4 +288,5 @@ class Server extends SimpleContainer implements IServerContainer { function getDatabaseConnection() { return \OC_DB::getConnection(); } + } |