upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

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

Browse source 
rtrim cloudId url earlier
This commit is contained in:
Maxence Lange 2022-09-15 10:46:39 -01:00 committed by GitHub
commit 381eb046b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/User/User.php
View file

@ -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;
}