Skip to content

[4.0] Ensure path contains api in the router #36315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 4, 2022
Merged

[4.0] Ensure path contains api in the router #36315

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c4def3
Ensure path contains api in the router
laoneo Dec 14, 2021
743cbe6
cs
laoneo Dec 15, 2021
5a46f92
Use uri
laoneo Jan 3, 2022
605e76d
simplify
laoneo Jan 3, 2022
bef9e0c
cs
laoneo Jan 3, 2022
92c4ebb
Merge remote-tracking branch 'upstream/4.0-dev' into j4/api/live/site
laoneo Jan 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions libraries/src/Uri/Uri.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,14 @@ public static function base($pathonly = false)
static::$base['prefix'] = $uri->toString(array('scheme', 'host', 'port'));
static::$base['path'] = rtrim($uri->toString(array('path')), '/\\');

if (\defined('JPATH_BASE') && \defined('JPATH_ADMINISTRATOR'))
if (\defined('JPATH_BASE') && \defined('JPATH_ADMINISTRATOR') && JPATH_BASE == JPATH_ADMINISTRATOR)
{
if (JPATH_BASE == JPATH_ADMINISTRATOR)
{
static::$base['path'] .= '/administrator';
}
static::$base['path'] .= '/administrator';
}

if (\defined('JPATH_BASE') && \defined('JPATH_API') && JPATH_BASE == JPATH_API)
{
static::$base['path'] .= '/api';
}
}
else
Expand Down