summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-04-23 20:11:21 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-04-23 20:11:21 +0200
commit19109afa79551e6dccbfc86ca27939b9df0fb7de (patch)
tree846fd15a2fa46341e5cd4dc36d1e8f74dddff0f5
parentd1110c62ef084d5d38b8770a26def88dd0976674 (diff)
downloadnextcloud-server-19109afa79551e6dccbfc86ca27939b9df0fb7de.tar.gz
nextcloud-server-19109afa79551e6dccbfc86ca27939b9df0fb7de.zip
fix bug in lib base
-rw-r--r--lib/base.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php
index 97b363b1fa9..0802e040c0f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -406,7 +406,9 @@ class OC{
if(substr_count(self::$REQUESTEDFILE, '?') != 0){
$file = substr(self::$REQUESTEDFILE, 0, strpos(self::$REQUESTEDFILE, '?'));
$param = substr(self::$REQUESTEDFILE, strpos(self::$REQUESTEDFILE, '?') + 1);
- parse_str($param, $_GET);
+ echo $param;
+ parse_str($param, $get);
+ $_GET = array_merge($_GET, $get);
self::$REQUESTEDFILE = $file;
$_GET['getfile'] = $file;
}