diff options
Diffstat (limited to 'lib/route.php')
| -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); } } |