29
0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-27 07:33:41 +00:00

[#24455] Alias URL does not work with Language filter plugin active - sef off

git-svn-id: http://joomlacode.org/svn/joomla/development/trunk@20757 6f6e1ebd-4c2b-0410-823f-f34bde69bce9
This commit is contained in:
Mark Dexter 2011-02-18 04:38:02 +00:00
parent 948d554931
commit 979426f6ea
2 changed files with 5 additions and 3 deletions

View File

@ -114,7 +114,7 @@ class JRouterSite extends JRouter
$vars = array();
$app = JFactory::getApplication();
$menu = $app->getMenu(true);
//Handle an empty URL (special case)
if (!$uri->getVar('Itemid') && !$uri->getVar('option')) {
$item = $menu->getDefault(JFactory::getLanguage()->getTag());
@ -141,8 +141,9 @@ class JRouterSite extends JRouter
//Get the itemid, if it hasn't been set force it to null
$this->setVar('Itemid', JRequest::getInt('Itemid', null));
// Only an Itemid ? Get the full information from the itemid
if (count($this->getVars()) == 1) {
// Only an Itemid OR if filter language plugin set? Get the full information from the itemid
if (count($this->getVars()) == 1 || ( $app->getLanguageFilter() && count( $this->getVars()) == 2 )) {
$item = $menu->getItem($this->getVar('Itemid'));
if ($item !== NULL && is_array($item->query)) {
$vars = $vars + $item->query;

View File

@ -37,6 +37,7 @@ $ -> Language fix or change
# [#24496] Improve installation.js
# [#24859] Debug Language showing up
# [#24856] Get error after save options for component
# [#24455] Alias URL does not work with Language filter plugin active - sef off
17-Feb-2011 Jean-Marie Simonet
$ Updating ar-AA and sv-SE