Skip to content

[#33688] JApplicationCms::getRouter is a static method #3548

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 3 commits into from
Closed

[#33688] JApplicationCms::getRouter is a static method #3548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2231ff5
getRouter is a static method
wilsonge May 2, 2014
e69dfcf
Update route.php
wilsonge May 2, 2014
d8645eb
Fix more instances to be static
wilsonge May 2, 2014
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
2 changes: 1 addition & 1 deletion components/com_finder/views/search/view.html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public function display($tpl = null)
if (strpos($this->query->input, '"'))
{
// Get the application router.
$router =& $app->getRouter();
$router =& $app::getRouter();

// Fix the q variable in the URL.
if ($router->getVar('q') !== $this->query->input)
Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/application/cms.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,7 @@ protected function route()
// Get the full request URI.
$uri = clone JUri::getInstance();

$router = $this->getRouter();
$router = static::getRouter();
$result = $router->parse($uri);

foreach ($result as $key => $value)
Expand Down
3 changes: 2 additions & 1 deletion libraries/joomla/application/route.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ public static function _($url, $xhtml = true, $ssl = null)
if (!self::$_router)
{
// Get the router.
self::$_router = JFactory::getApplication()->getRouter();
$app = JFactory::getApplication();
self::$_router = $app::getRouter();

// Make sure that we have our router
if (!self::$_router)
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_login/helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ModLoginHelper
public static function getReturnURL($params, $type)
{
$app = JFactory::getApplication();
$router = $app->getRouter();
$router = $app::getRouter();
$url = null;

if ($itemid = $params->get($type))
Expand Down
4 changes: 2 additions & 2 deletions plugins/system/languagefilter/languagefilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function __construct(&$subject, $config)
if (!self::$default_lang)
{
$app = JFactory::getApplication();
$router = $app->getRouter();
$router = $app::getRouter();

if ($app->isSite())
{
Expand Down Expand Up @@ -152,7 +152,7 @@ public function onAfterInitialise()
{
self::$tag = JFactory::getLanguage()->getTag();

$router = $app->getRouter();
$router = $app::getRouter();

// Attach build rules for language SEF.
$router->attachBuildRule(array($this, 'buildRule'));
Expand Down
2 changes: 1 addition & 1 deletion plugins/system/sef/sef.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function onAfterRoute()
return true;
}

$router = $app->getRouter();
$router = $app::getRouter();

$uri = clone JUri::getInstance();
$domain = $this->params->get('domain');
Expand Down