fixing errors regarding wrong function calls / missing parameters

diff --git a/lib/private/helper.php b/lib/private/helper.php
index a34640d8e362ba5b9cb1965f713aba98501d7802..f3f2ea9492aa8b845b1ca01395f313733c7a3c2a 100644 (file)
--- 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 73a0cbd6ce606c99fa5b9ea02544408616449c91..e55f59f6a1c18b93dc74e9f1b5d8559f548f0a36 100644 (file)
--- 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();
        }
+
 }