From 210ea4d9d9a3488918c898beb6d6508c60686ad1 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 29 Sep 2012 18:03:34 +0200
Subject: [PATCH] fix actioninclude

---
 lib/route.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/route.php b/lib/route.php
index ba9d1724d1..c5a8bd2aa3 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);
 	}
 }