Skip to content

[4.0]Update SiteRouter.php #22766

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

Closed
wants to merge 2 commits into from
Closed

[4.0]Update SiteRouter.php #22766

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d4e248
Update SiteRouter.php
Oct 22, 2018
048a973
Update SiteRouter.php
Oct 23, 2018
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
29 changes: 29 additions & 0 deletions libraries/src/Router/SiteRouter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,35 @@ public function getComponentRouter($component)
{
$this->componentRouters[$component] = $componentInstance->createRouter($this->app, $this->menu);
}

Copy link
Contributor

@Quy Quy Oct 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove tabs on lines 619, 625, 630, 637, and 641.

Copy link
Contributor Author

@joeforjoomla joeforjoomla Oct 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

// Keep support for components implementing the new format but don't implement the RouterServiceInterface
if (!isset($this->componentRouters[$component]))
{
$compname = ucfirst(substr($component, 4));
$class = $compname . 'Router';

if (!class_exists($class))
{
// Use the component routing handler if it exists
$path = JPATH_SITE . '/components/' . $component . '/router.php';

// Use the custom routing handler if it exists
if (file_exists($path))
{
require_once $path;
}
}

if (class_exists($class))
{
$reflection = new \ReflectionClass($class);

if (in_array('Joomla\\CMS\\Component\\Router\\RouterInterface', $reflection->getInterfaceNames()))
{
$this->componentRouters[$component] = new $class($this->app, $this->menu);
}
}
}

if (!isset($this->componentRouters[$component]))
{
Expand Down