summaryrefslogtreecommitdiffstats
path: root/lib/helper.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-01-30 19:24:24 +0100
committerRobin Appelman <icewind@owncloud.com>2013-01-30 19:24:24 +0100
commit207aa22d12931d161f682198996086e74c91bf53 (patch)
tree26f65a42462244fdfc14e15c7788da8b7f8a524e /lib/helper.php
parent95352fbc1568e0c49be25461a07d53b3d5ad3b45 (diff)
parent2fbf3d40900d29c04b69f0c18e4d833a312fb21c (diff)
downloadnextcloud-server-207aa22d12931d161f682198996086e74c91bf53.tar.gz
nextcloud-server-207aa22d12931d161f682198996086e74c91bf53.zip
merge master into filesystem
Diffstat (limited to 'lib/helper.php')
-rw-r--r--lib/helper.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/helper.php b/lib/helper.php
index c2a0d83f6b1..0e549d006a1 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -78,11 +78,8 @@ class OC_Helper {
}
}
- if (!empty($args)) {
- $urlLinkTo .= '?';
- foreach($args as $k => $v) {
- $urlLinkTo .= '&'.$k.'='.urlencode($v);
- }
+ if ($args && $query = http_build_query($args, '', '&')) {
+ $urlLinkTo .= '?'.$query;
}
return $urlLinkTo;