From 780280e53f162619ba513bed4e39dde6c0f591a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 7 Oct 2013 00:35:05 +0200
Subject: [PATCH] fixing errors regarding wrong function calls / missing
parameters
---
lib/private/helper.php | 2 +-
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 a34640d8e3..f3f2ea9492 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 73a0cbd6ce..e55f59f6a1 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();
}
+
}
--
GitLab