summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2017-02-09 13:31:06 +0100
committerRobin Appelman <robin@icewind.nl>2017-02-09 13:31:06 +0100
commitf6cd5200a20f7adfe3b3f7b48d0ade4a75829a31 (patch)
treecf12003e7ccc74b37d59e4e234aaf45535fcb3ce /lib
parentae66cf8d3713e6ed84396a23b506a7252b5860bc (diff)
downloadnextcloud-server-f6cd5200a20f7adfe3b3f7b48d0ade4a75829a31.tar.gz
nextcloud-server-f6cd5200a20f7adfe3b3f7b48d0ade4a75829a31.zip
clean cloud ids
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Federation/CloudIdManager.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/private/Federation/CloudIdManager.php b/lib/private/Federation/CloudIdManager.php
index 0df8f080d2d..2e6232fa862 100644
--- a/lib/private/Federation/CloudIdManager.php
+++ b/lib/private/Federation/CloudIdManager.php
@@ -34,7 +34,7 @@ class CloudIdManager implements ICloudIdManager {
}
// Find the first character that is not allowed in user names
- $id = str_replace('\\', '/', $cloudId);
+ $id = $this->fixRemoteURL($cloudId);
$posSlash = strpos($id, '/');
$posColon = strpos($id, ':');
@@ -58,9 +58,8 @@ class CloudIdManager implements ICloudIdManager {
if ($pos !== false) {
$user = substr($id, 0, $pos);
$remote = substr($id, $pos + 1);
- $remote = $this->fixRemoteURL($remote);
if (!empty($user) && !empty($remote)) {
- return new CloudId($cloudId, $user, $remote);
+ return new CloudId($id, $user, $remote);
}
}
throw new \InvalidArgumentException('Invalid cloud id');