mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-03 15:07:53 +02:00
Code Issues Releases Wiki Activity

fix: don't duplicate path in URL to post on subdirectory installs. (#3354)

Browse Source 
`baseUrl` includes the path portion of the url, as does `basePath`, which is included in `app.route.x` function outputs. The `baseOrigin` (with no path component at all) should be used instead.
This commit is contained in:
Alexander Skvortsov
2022-04-23 10:23:03 -04:00
committed by GitHub
parent b8df3863d1
commit 863a8ddfff
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/js/src/forum/components/PostMeta.js
View File

@@ -55,6 +55,6 @@ export default class PostMeta extends Component {
* @returns {string} * @returns {string}
*/ */
getPermalink(post) { getPermalink(post) {
return app.forum.attribute('baseUrl') + app.route.post(post); return app.forum.attribute('baseOrigin') + app.route.post(post);
} }
} }

3
framework/core/src/Api/Serializer/ForumSerializer.php
View File

@@ -75,7 +75,8 @@ class ForumSerializer extends AbstractSerializer
'description' => $this->settings->get('forum_description'), 'description' => $this->settings->get('forum_description'),
'showLanguageSelector' => (bool) $this->settings->get('show_language_selector', true), 'showLanguageSelector' => (bool) $this->settings->get('show_language_selector', true),
'baseUrl' => $url = $this->url->to('forum')->base(), 'baseUrl' => $url = $this->url->to('forum')->base(),
'basePath' => parse_url($url, PHP_URL_PATH) ?: '', 'basePath' => $path = parse_url($url, PHP_URL_PATH) ?: '',
'baseOrigin' => substr($url, 0, strlen($url) - strlen($path)),
'debug' => $this->config->inDebugMode(), 'debug' => $this->config->inDebugMode(),
'apiUrl' => $this->url->to('api')->base(), 'apiUrl' => $this->url->to('api')->base(),
'welcomeTitle' => $this->settings->get('welcome_title'), 'welcomeTitle' => $this->settings->get('welcome_title'),