summaryrefslogtreecommitdiffstats
path: root/apps/files_external/lib
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-12-25 14:29:29 +0100
committerRobin Appelman <icewind@owncloud.com>2012-12-25 14:29:29 +0100
commit7e36f730ecfe452681f44771b28d1d3c4a5535df (patch)
tree578e604c170219151239e2da345d332b079ed920 /apps/files_external/lib
parentbf05ff351faa693337107ed4a316e36e9aacd296 (diff)
parent5d59ac07391841677e204958ea20be3fe05cd8ef (diff)
downloadnextcloud-server-7e36f730ecfe452681f44771b28d1d3c4a5535df.tar.gz
nextcloud-server-7e36f730ecfe452681f44771b28d1d3c4a5535df.zip
merge master into filesystem
Diffstat (limited to 'apps/files_external/lib')
-rwxr-xr-xapps/files_external/lib/config.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 959086e43dc..0e0bc56ad0e 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -331,7 +331,7 @@ class OC_Mount_Config {
foreach ($data[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
$content .= "\t\t'".$group."' => array (\n";
foreach ($mounts as $mountPoint => $mount) {
- $content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).", \n";
+ $content .= "\t\t\t'".addcslashes($mountPoint,"'")."' => ".str_replace("\n", '', var_export($mount, true)).", \n";
}
$content .= "\t\t),\n";
@@ -343,7 +343,7 @@ class OC_Mount_Config {
foreach ($data[self::MOUNT_TYPE_USER] as $user => $mounts) {
$content .= "\t\t'".$user."' => array (\n";
foreach ($mounts as $mountPoint => $mount) {
- $content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n";
+ $content .= "\t\t\t'".addcslashes($mountPoint,"'")."' => ".str_replace("\n", '', var_export($mount, true)).",\n";
}
$content .= "\t\t),\n";
}