diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-16 23:15:25 +0400 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-16 23:15:25 +0400 |
| commit | 221a650815800e47d6b2c9d7dfe0e9434ebc9edf (patch) | |
| tree | 1da8fba37b07bbfd600f98039335a612c351972e /lib/private/server.php | |
| parent | 852a50aa8968560738f61e32d8b1cb7f5cd329c1 (diff) | |
| parent | 2fe9294c5d65e7e2264a8ddf10985bdd00c83a5a (diff) | |
Merge branch 'master' into activities-api
Conflicts:
lib/private/server.php
Diffstat (limited to 'lib/private/server.php')
| -rw-r--r-- | lib/private/server.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/private/server.php b/lib/private/server.php index 7f86919f845..d450907534b 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, ) |