Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: broken URL when username contains subfolder. (#11786) 

The bug was mentioned on [meta](https://meta.discourse.org/t/two-bugs-with-usernames-starting-with-subfolder-name/169505)

When discourse is installed on `/subfolder` and username is containing subfolder name like for example `subfolderadmin` - user URLs were incorrect.

Instead of having `/subfolder/u/subfolderadmin/summary/` we were leading to `/subfolder/uadmin/summary`.

The reason for that was incorrect check in `getUrl` helper:

```javascript
  const found = url.indexOf(baseUri);
  if (found >= 0 && found < 3) {
    return url;
  }
  return baseUri + url;
```
baseUri is `/subfolder`, url is `/u/subfolderadmin` and indexOf returned position which in the end returned incorrect URL.

I think that we should check if the URL starts with baseUri and not if contains baseUri.
This commit is contained in:
Krzysztof Kotlarek 2021-01-22 08:43:14 +11:00 committed by GitHub
parent a8c5ef7dff
commit 5cbb522c41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse-common/addon/lib/get-url.js
View File

@ -15,9 +15,9 @@ export default function getURL(url) {
return url;
}
const found = url.indexOf(baseUri);
const found = url.startsWith(baseUri);
if (found >= 0 && found < 3) {
if (found) {
return url;
}
if (url[0] !== "/") {

6
app/assets/javascripts/discourse/tests/unit/lib/get-url-test.js
View File

@ -60,6 +60,12 @@ module("Unit | Utility | get-url", function () {
"relative url has subfolder"
);
assert.equal(
getURL("/u/forumadmin"),
"/forum/u/forumadmin",
"relative url has subfolder even if username contains subfolder"
);
assert.equal(
getURL(""),
"/forum",