diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-09-29 18:03:34 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-09-29 18:03:34 +0200 |
| commit | 210ea4d9d9a3488918c898beb6d6508c60686ad1 (patch) | |
| tree | 5d42b0d4f38cc3fb21a66b71b182f611939ad61b | |
| parent | d0bd2bbf2728cdf472044d76aea97f0d4809774a (diff) | |
| download | nextcloud-server-210ea4d9d9a3488918c898beb6d6508c60686ad1.tar.gz nextcloud-server-210ea4d9d9a3488918c898beb6d6508c60686ad1.zip | |
fix actioninclude
| -rw-r--r-- | lib/route.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/route.php b/lib/route.php index ba9d1724d12..c5a8bd2aa36 100644 --- a/lib/route.php +++ b/lib/route.php @@ -66,7 +66,7 @@ class OC_Route extends Route { } public function actionInclude($file) { - $function = create_function('$param', 'unset($param["_route"]);$_GET=$param;unset($param);require_once "'.$file.'";'); + $function = create_function('$param', 'unset($param["_route"]);$_GET=array_merge($_GET,$param);unset($param);require_once "'.$file.'";'); $this->action($function); } } |