diff options
author | Arthur Schiwon <blizzz@owncloud.com> | 2012-11-04 19:58:48 +0100 |
---|---|---|
committer | Arthur Schiwon <blizzz@owncloud.com> | 2012-11-04 19:58:48 +0100 |
commit | 00bb246a0d90ddbcc1016fdedb5cf629bfbca70a (patch) | |
tree | f5d69cf10ef3fd157a21990a38515c03b74035a1 /lib/route.php | |
parent | df8c67721df1358eab7aa5794ef223a5bc8f0b59 (diff) | |
parent | 8ac3849a95bd6a733cce9134bab4bf38c5c0fadd (diff) | |
download | nextcloud-server-00bb246a0d90ddbcc1016fdedb5cf629bfbca70a.tar.gz nextcloud-server-00bb246a0d90ddbcc1016fdedb5cf629bfbca70a.zip |
merge from master
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 d5233d79861..5901717c094 100644 --- a/lib/route.php +++ b/lib/route.php @@ -108,7 +108,7 @@ class OC_Route extends Route { public function actionInclude($file) { $function = create_function('$param', 'unset($param["_route"]);' - .'$_GET=array_merge($_GET,$param);' + .'$_GET=array_merge($_GET, $param);' .'unset($param);' .'require_once "'.$file.'";'); $this->action($function); |