Merge pull request #33793 from nextcloud/fix/noid/rtrim-cloud-id

rtrim cloudId url earlier
pull/34091/head
Maxence Lange 3 years ago committed by GitHub
commit 381eb046b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      lib/private/User/User.php

@ -558,11 +558,11 @@ class User implements IUser {
*/
public function getCloudId() {
$uid = $this->getUID();
$server = $this->urlGenerator->getAbsoluteURL('/');
$server = rtrim($this->urlGenerator->getAbsoluteURL('/'), '/');
if (substr($server, -10) === '/index.php') {
$server = substr($server, 0, -10);
}
$server = rtrim($this->removeProtocolFromUrl($server), '/');
$server = $this->removeProtocolFromUrl($server);
return $uid . '@' . $server;
}

Loading…
Cancel
Save