From 299689ab5683f4ca7e3e2303b86c026be9c54b22 Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Thu, 30 Aug 2018 11:14:34 +0200 Subject: [PATCH 1/8] [4.0] Correcting info-block category and parent category urls --- components/com_content/Model/ArticleModel.php | 6 ++++-- .../com_content/Model/ArticlesModel.php | 6 ++++-- .../com_content/View/Archive/HtmlView.php | 9 +++++--- .../com_content/View/Article/HtmlView.php | 10 +++++---- .../com_content/View/Category/HtmlView.php | 9 ++++---- .../com_content/View/Featured/HtmlView.php | 8 ++++--- components/com_content/helpers/route.php | 21 ++++++++++--------- .../tmpl/archive/default_items.php | 13 +++++++----- .../tmpl/category/blog_children.php | 4 ++-- .../tmpl/category/default_children.php | 4 ++-- .../joomla/content/info_block/category.php | 5 +++-- .../content/info_block/parent_category.php | 3 ++- 12 files changed, 58 insertions(+), 40 deletions(-) diff --git a/components/com_content/Model/ArticleModel.php b/components/com_content/Model/ArticleModel.php index dafa7d6d01cf6..5d80777972ba9 100644 --- a/components/com_content/Model/ArticleModel.php +++ b/components/com_content/Model/ArticleModel.php @@ -115,7 +115,8 @@ public function getItem($pk = null) ->where($db->quoteName('wa.stage_id') . ' = ' . $db->quoteName('ws.id')); // Join on category table. - $query->select('c.title AS category_title, c.alias AS category_alias, c.access AS category_access') + $query->select('c.title AS category_title, c.alias AS category_alias, c.access AS category_access,' . + 'c.language AS category_language') ->innerJoin('#__categories AS c on c.id = a.catid') ->where('c.published > 0'); @@ -130,7 +131,8 @@ public function getItem($pk = null) } // Join over the categories to get parent category titles - $query->select('parent.title as parent_title, parent.id as parent_id, parent.path as parent_route, parent.alias as parent_alias') + $query->select('parent.title as parent_title, parent.id as parent_id, parent.path as parent_route,' . + 'parent.alias as parent_alias, parent.language as parent_language') ->join('LEFT', '#__categories as parent ON parent.id = c.parent_id'); // Join on voting table diff --git a/components/com_content/Model/ArticlesModel.php b/components/com_content/Model/ArticlesModel.php index c8d4fc0d3899f..b5791b7bba5cd 100644 --- a/components/com_content/Model/ArticlesModel.php +++ b/components/com_content/Model/ArticlesModel.php @@ -251,7 +251,8 @@ protected function getListQuery() ->join('LEFT', '#__workflow_stages AS ws ON ws.id = wa.stage_id'); // Join over the categories. - $query->select('c.title AS category_title, c.path AS category_route, c.access AS category_access, c.alias AS category_alias') + $query->select('c.title AS category_title, c.path AS category_route, c.access AS category_access, c.alias AS category_alias,' . + 'c.language AS category_language') ->select('c.published, c.published AS parents_published, c.lft') ->join('LEFT', '#__categories AS c ON c.id = a.catid'); @@ -262,7 +263,8 @@ protected function getListQuery() ->join('LEFT', '#__users AS uam ON uam.id = a.modified_by'); // Join over the categories to get parent category titles - $query->select('parent.title as parent_title, parent.id as parent_id, parent.path as parent_route, parent.alias as parent_alias') + $query->select('parent.title as parent_title, parent.id as parent_id, parent.path as parent_route, parent.alias as parent_alias,' . + 'parent.language as parent_language') ->join('LEFT', '#__categories as parent ON parent.id = c.parent_id'); if (PluginHelper::isEnabled('content', 'vote')) diff --git a/components/com_content/View/Archive/HtmlView.php b/components/com_content/View/Archive/HtmlView.php index cceb8a2e931f3..68a7e3f4f8d1d 100644 --- a/components/com_content/View/Archive/HtmlView.php +++ b/components/com_content/View/Archive/HtmlView.php @@ -115,13 +115,16 @@ public function display($tpl = null) foreach ($items as $item) { - $item->catslug = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid; - $item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id; + $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; + $item->catslug = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid; + $item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id; + $item->catlanguage = $item->category_language; + $item->parentlanguage = $item->parent_language; // No link for ROOT category if ($item->parent_alias === 'root') { - $item->parent_slug = null; + $item->parent_slug = null; } $item->event = new \stdClass; diff --git a/components/com_content/View/Article/HtmlView.php b/components/com_content/View/Article/HtmlView.php index 8154b7200d664..0931ab93f832f 100644 --- a/components/com_content/View/Article/HtmlView.php +++ b/components/com_content/View/Article/HtmlView.php @@ -107,9 +107,11 @@ public function display($tpl = null) $item->tagLayout = new FileLayout('joomla.content.tags'); // Add router helpers. - $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; - $item->catslug = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid; - $item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id; + $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; + $item->catslug = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid; + $item->catlanguage = $item->category_language; + $item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id; + $item->parentlanguage = $item->parent_language; // No link for ROOT category if ($item->parent_alias === 'root') @@ -302,7 +304,7 @@ protected function _prepareDocument() while ($category && ($menu->query['option'] !== 'com_content' || $menu->query['view'] === 'article' || $id != $category->id) && $category->id > 1) { - $path[] = array('title' => $category->title, 'link' => \ContentHelperRoute::getCategoryRoute($category->id)); + $path[] = array('title' => $category->title, 'link' => \ContentHelperRoute::getCategoryRoute($category->id, $category->language)); $category = $category->getParent(); } diff --git a/components/com_content/View/Category/HtmlView.php b/components/com_content/View/Category/HtmlView.php index 940d41eda9f5e..20f46ca4e7880 100644 --- a/components/com_content/View/Category/HtmlView.php +++ b/components/com_content/View/Category/HtmlView.php @@ -93,9 +93,11 @@ public function display($tpl = null) // Compute the article slugs and prepare introtext (runs content plugins). foreach ($this->items as $item) { - $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; - - $item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id; + $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; + $item->catslug = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid; + $item->catlanguage = $item->category_language; + $item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id; + $item->parentlanguage = $item->parent_language; // No link for ROOT category if ($item->parent_alias === 'root') @@ -103,7 +105,6 @@ public function display($tpl = null) $item->parent_slug = null; } - $item->catslug = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid; $item->event = new \stdClass; // Old plugins: Ensure that text property is available diff --git a/components/com_content/View/Featured/HtmlView.php b/components/com_content/View/Featured/HtmlView.php index dde1f0768b040..6a5d68056d4b4 100644 --- a/components/com_content/View/Featured/HtmlView.php +++ b/components/com_content/View/Featured/HtmlView.php @@ -140,9 +140,11 @@ public function display($tpl = null) // Compute the article slugs and prepare introtext (runs content plugins). foreach ($items as &$item) { - $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; - $item->catslug = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid; - $item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id; + $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; + $item->catslug = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid; + $item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id; + $item->catlanguage = $item->category_language; + $item->parentlanguage = $item->parent_language; // No link for ROOT category if ($item->parent_alias === 'root') diff --git a/components/com_content/helpers/route.php b/components/com_content/helpers/route.php index 6878b9def2bcf..c72a00cc7a3e5 100644 --- a/components/com_content/helpers/route.php +++ b/components/com_content/helpers/route.php @@ -10,6 +10,7 @@ defined('_JEXEC') or die; use Joomla\CMS\Categories\CategoryNode; +use Joomla\CMS\Factory; use Joomla\CMS\Language\Multilanguage; /** @@ -77,17 +78,17 @@ public static function getCategoryRoute($catid, $language = 0) { $link = 'index.php?option=com_content&view=category&id=' . $id; - if ($language && $language !== '*' && Multilanguage::isEnabled()) + if ($language && Multilanguage::isEnabled()) { - $link .= '&lang=' . $language; - } - - $jinput = JFactory::getApplication()->input; - $layout = $jinput->get('layout'); - - if ($layout !== '') - { - $link .= '&layout=' . $layout; + if ($language !== '*') + { + $link .= '&lang=' . $language; + } + else + { + $lang = Factory::getLanguage()->getTag(); + $link .= '&lang=' . $lang; + } } } diff --git a/components/com_content/tmpl/archive/default_items.php b/components/com_content/tmpl/archive/default_items.php index 7a02d9e6e022e..ad00bed20eb9d 100644 --- a/components/com_content/tmpl/archive/default_items.php +++ b/components/com_content/tmpl/archive/default_items.php @@ -60,7 +60,8 @@
escape($item->parent_title); ?> get('link_parent_category') && !empty($item->parent_slug)) : ?> - parent_slug)) . '" itemprop="genre">' . $title . ''; ?> + parent_slug), + $item->parentlanguage ) . '" itemprop="genre">' . $title . ''; ?> ' . $title . ''); ?> @@ -73,7 +74,8 @@
escape($item->category_title); ?> get('link_category') && $item->catslug) : ?> - catslug)) . '" itemprop="genre">' . $title . ''; ?> + catslug, + $item->catlanguage)) . '" itemprop="genre">' . $title . ''; ?> ' . $title . ''); ?> @@ -146,7 +148,8 @@
escape($item->parent_title); ?> get('link_parent_category') && $item->parent_slug) : ?> - parent_slug)) . '" itemprop="genre">' . $title . ''; ?> + parent_slug, + $item->parentlanguage)) . '" itemprop="genre">' . $title . ''; ?> ' . $title . ''); ?> @@ -159,7 +162,7 @@
escape($item->category_title); ?> get('link_category') && $item->catslug) : ?> - catslug)) . '" itemprop="genre">' . $title . ''; ?> + catslug, $item->catlanguage)) . '" itemprop="genre">' . $title . ''; ?> ' . $title . ''); ?> @@ -223,6 +226,6 @@

- pagination->getPagesLinks(); ?> + pagination->getPagesLinks(); ?>
diff --git a/components/com_content/tmpl/category/blog_children.php b/components/com_content/tmpl/category/blog_children.php index f379f045bb570..9505441dedc51 100644 --- a/components/com_content/tmpl/category/blog_children.php +++ b/components/com_content/tmpl/category/blog_children.php @@ -32,7 +32,7 @@ getNumItems(true); ?> - + escape($child->title); ?> maxLevel > 1 && count($child->getChildren()) > 0) : ?> @@ -40,7 +40,7 @@ -

+

escape($child->title); ?> params->get('show_cat_num_articles', 1)) : ?> diff --git a/components/com_content/tmpl/category/default_children.php b/components/com_content/tmpl/category/default_children.php index 43dda9177fc04..1e7256092d4b5 100644 --- a/components/com_content/tmpl/category/default_children.php +++ b/components/com_content/tmpl/category/default_children.php @@ -32,7 +32,7 @@ getNumItems(true); ?> - + escape($child->title); ?> getChildren()) > 0 && $this->maxLevel > 1) : ?> @@ -40,7 +40,7 @@

-

+

escape($child->title); ?> params->get('show_cat_num_articles', 1)) : ?> diff --git a/layouts/joomla/content/info_block/category.php b/layouts/joomla/content/info_block/category.php index 1cfd8515af37e..f9de571f1837f 100644 --- a/layouts/joomla/content/info_block/category.php +++ b/layouts/joomla/content/info_block/category.php @@ -15,8 +15,9 @@ ?>
escape($displayData['item']->category_title); ?> - get('link_category') && $displayData['item']->catslug) : ?> - catslug)) . '" itemprop="genre">' . $title . ''; ?> + get('link_category') && !empty($displayData['item']->catslug)) : ?> + catslug, + $displayData['item']->catlanguage)) . '" itemprop="genre">' . $title . ''; ?> ' . $title . ''); ?> diff --git a/layouts/joomla/content/info_block/parent_category.php b/layouts/joomla/content/info_block/parent_category.php index b142742c568de..3e6fac149bc5b 100644 --- a/layouts/joomla/content/info_block/parent_category.php +++ b/layouts/joomla/content/info_block/parent_category.php @@ -17,7 +17,8 @@
escape($displayData['item']->parent_title); ?> get('link_parent_category') && !empty($displayData['item']->parent_slug)) : ?> - parent_slug)) . '" itemprop="genre">' . $title . ''; ?> + parent_slug, + $displayData['item']->parent_language)) . '" itemprop="genre">' . $title . ''; ?> ' . $title . ''); ?> From e50668a9bf485aebab5759264227e95794449f04 Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Fri, 31 Aug 2018 08:49:22 +0200 Subject: [PATCH 2/8] Getting rid of category slugs thanks Hannes --- .../com_content/View/Archive/HtmlView.php | 8 ++--- .../com_content/View/Article/HtmlView.php | 8 ++--- .../com_content/View/Category/HtmlView.php | 8 ++--- .../com_content/View/Featured/HtmlView.php | 8 ++--- .../tmpl/archive/default_items.php | 35 ++++++++++++------- layouts/joomla/content/info_block.php | 2 +- .../joomla/content/info_block/category.php | 8 +++-- .../content/info_block/parent_category.php | 9 ++--- 8 files changed, 41 insertions(+), 45 deletions(-) diff --git a/components/com_content/View/Archive/HtmlView.php b/components/com_content/View/Archive/HtmlView.php index 68a7e3f4f8d1d..0199194a6958e 100644 --- a/components/com_content/View/Archive/HtmlView.php +++ b/components/com_content/View/Archive/HtmlView.php @@ -115,16 +115,12 @@ public function display($tpl = null) foreach ($items as $item) { - $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; - $item->catslug = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid; - $item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id; - $item->catlanguage = $item->category_language; - $item->parentlanguage = $item->parent_language; + $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; // No link for ROOT category if ($item->parent_alias === 'root') { - $item->parent_slug = null; + $item->parent_id = null; } $item->event = new \stdClass; diff --git a/components/com_content/View/Article/HtmlView.php b/components/com_content/View/Article/HtmlView.php index 0931ab93f832f..f72203c8eef54 100644 --- a/components/com_content/View/Article/HtmlView.php +++ b/components/com_content/View/Article/HtmlView.php @@ -107,16 +107,12 @@ public function display($tpl = null) $item->tagLayout = new FileLayout('joomla.content.tags'); // Add router helpers. - $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; - $item->catslug = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid; - $item->catlanguage = $item->category_language; - $item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id; - $item->parentlanguage = $item->parent_language; + $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; // No link for ROOT category if ($item->parent_alias === 'root') { - $item->parent_slug = null; + $item->parent_id = null; } // TODO: Change based on shownoauth diff --git a/components/com_content/View/Category/HtmlView.php b/components/com_content/View/Category/HtmlView.php index 20f46ca4e7880..11b3024818d78 100644 --- a/components/com_content/View/Category/HtmlView.php +++ b/components/com_content/View/Category/HtmlView.php @@ -93,16 +93,12 @@ public function display($tpl = null) // Compute the article slugs and prepare introtext (runs content plugins). foreach ($this->items as $item) { - $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; - $item->catslug = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid; - $item->catlanguage = $item->category_language; - $item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id; - $item->parentlanguage = $item->parent_language; + $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; // No link for ROOT category if ($item->parent_alias === 'root') { - $item->parent_slug = null; + $item->parent_id = null; } $item->event = new \stdClass; diff --git a/components/com_content/View/Featured/HtmlView.php b/components/com_content/View/Featured/HtmlView.php index 6a5d68056d4b4..e82bb2bd707f8 100644 --- a/components/com_content/View/Featured/HtmlView.php +++ b/components/com_content/View/Featured/HtmlView.php @@ -140,16 +140,12 @@ public function display($tpl = null) // Compute the article slugs and prepare introtext (runs content plugins). foreach ($items as &$item) { - $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; - $item->catslug = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid; - $item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id; - $item->catlanguage = $item->category_language; - $item->parentlanguage = $item->parent_language; + $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; // No link for ROOT category if ($item->parent_alias === 'root') { - $item->parent_slug = null; + $item->parent_id = null; } $item->event = new \stdClass; diff --git a/components/com_content/tmpl/archive/default_items.php b/components/com_content/tmpl/archive/default_items.php index ad00bed20eb9d..d37f080f5d750 100644 --- a/components/com_content/tmpl/archive/default_items.php +++ b/components/com_content/tmpl/archive/default_items.php @@ -55,13 +55,15 @@ - get('show_parent_category') && !empty($item->parent_slug)) : ?> + get('show_parent_category') && !empty($item->parent_id)) : ?>
escape($item->parent_title); ?> - get('link_parent_category') && !empty($item->parent_slug)) : ?> - parent_slug), - $item->parentlanguage ) . '" itemprop="genre">' . $title . ''; ?> + get('link_parent_category') && !empty($item->parent_id)) : ?> + parent_id), $item->parent_language + ) + . '" itemprop="genre">' . $title . ''; ?> ' . $title . ''); ?> @@ -73,9 +75,11 @@
escape($item->category_title); ?> - get('link_category') && $item->catslug) : ?> - catslug, - $item->catlanguage)) . '" itemprop="genre">' . $title . ''; ?> + get('link_category') && $item->catid) : ?> + catid, $item->category_language) + ) + . '" itemprop="genre">' . $title . ''; ?> ' . $title . ''); ?> @@ -143,13 +147,15 @@
- get('show_parent_category') && !empty($item->parent_slug)) : ?> + get('show_parent_category') && !empty($item->parent_id)) : ?>
escape($item->parent_title); ?> - get('link_parent_category') && $item->parent_slug) : ?> - parent_slug, - $item->parentlanguage)) . '" itemprop="genre">' . $title . ''; ?> + get('link_parent_category') && $item->parent_id) : ?> + parent_id, $item->parent_language) + ) + . '" itemprop="genre">' . $title . ''; ?> ' . $title . ''); ?> @@ -161,8 +167,11 @@
escape($item->category_title); ?> - get('link_category') && $item->catslug) : ?> - catslug, $item->catlanguage)) . '" itemprop="genre">' . $title . ''; ?> + get('link_category') && $item->catid) : ?> + catslug, $item->category_language) + ) + . '" itemprop="genre">' . $title . ''; ?> ' . $title . ''); ?> diff --git a/layouts/joomla/content/info_block.php b/layouts/joomla/content/info_block.php index 2656c8731eefb..86c2d80ce95c0 100644 --- a/layouts/joomla/content/info_block.php +++ b/layouts/joomla/content/info_block.php @@ -30,7 +30,7 @@ sublayout('author', $displayData); ?> - get('show_parent_category') && !empty($displayData['item']->parent_slug)) : ?> + get('show_parent_category') && !empty($displayData['item']->parent_id)) : ?> sublayout('parent_category', $displayData); ?> diff --git a/layouts/joomla/content/info_block/category.php b/layouts/joomla/content/info_block/category.php index f9de571f1837f..5f87cd5986c29 100644 --- a/layouts/joomla/content/info_block/category.php +++ b/layouts/joomla/content/info_block/category.php @@ -15,9 +15,11 @@ ?>
escape($displayData['item']->category_title); ?> - get('link_category') && !empty($displayData['item']->catslug)) : ?> - catslug, - $displayData['item']->catlanguage)) . '" itemprop="genre">' . $title . ''; ?> + get('link_category') && !empty($displayData['item']->catid)) : ?> + catid, $displayData['item']->category_language) + ) + . '" itemprop="genre">' . $title . ''; ?> ' . $title . ''); ?> diff --git a/layouts/joomla/content/info_block/parent_category.php b/layouts/joomla/content/info_block/parent_category.php index 3e6fac149bc5b..4b60d7b20ddb6 100644 --- a/layouts/joomla/content/info_block/parent_category.php +++ b/layouts/joomla/content/info_block/parent_category.php @@ -9,16 +9,17 @@ defined('JPATH_BASE') or die; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; ?>
escape($displayData['item']->parent_title); ?> - get('link_parent_category') && !empty($displayData['item']->parent_slug)) : ?> - parent_slug, - $displayData['item']->parent_language)) . '" itemprop="genre">' . $title . ''; ?> + get('link_parent_category') && !empty($displayData['item']->parent_id)) : ?> + parent_id, $displayData['item']->parent_language) + ) + . '" itemprop="genre">' . $title . ''; ?> ' . $title . ''); ?> From c1d382f3112cebc686022c0471d278bcdb9339bf Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Fri, 31 Aug 2018 10:05:13 +0200 Subject: [PATCH 3/8] missing one cat language variable --- components/com_content/View/Category/HtmlView.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/com_content/View/Category/HtmlView.php b/components/com_content/View/Category/HtmlView.php index 11b3024818d78..ce2360b57464c 100644 --- a/components/com_content/View/Category/HtmlView.php +++ b/components/com_content/View/Category/HtmlView.php @@ -287,7 +287,7 @@ protected function prepareDocument() while (($menu->query['option'] !== 'com_content' || $menu->query['view'] === 'article' || $id != $category->id) && $category->id > 1) { - $path[] = array('title' => $category->title, 'link' => \ContentHelperRoute::getCategoryRoute($category->id)); + $path[] = array('title' => $category->title, 'link' => \ContentHelperRoute::getCategoryRoute($category->id, $category->language)); $category = $category->getParent(); } From c21eb52f4a85a02ad80742497b31a6805107cc2b Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Fri, 31 Aug 2018 11:34:22 +0200 Subject: [PATCH 4/8] Correcting routing for archived --- components/com_content/tmpl/archive/default_items.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/com_content/tmpl/archive/default_items.php b/components/com_content/tmpl/archive/default_items.php index d37f080f5d750..f0c5857c51483 100644 --- a/components/com_content/tmpl/archive/default_items.php +++ b/components/com_content/tmpl/archive/default_items.php @@ -61,7 +61,7 @@ escape($item->parent_title); ?> get('link_parent_category') && !empty($item->parent_id)) : ?> parent_id), $item->parent_language + ContentHelperRoute::getCategoryRoute($item->parent_id, $item->parent_language) ) . '" itemprop="genre">' . $title . ''; ?> @@ -169,7 +169,7 @@ escape($item->category_title); ?> get('link_category') && $item->catid) : ?> catslug, $item->category_language) + ContentHelperRoute::getCategoryRoute($item->catid, $item->category_language) ) . '" itemprop="genre">' . $title . ''; ?> From 2141933b6d7d6f6110131e10f588c54ab420739a Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Fri, 31 Aug 2018 17:09:59 +0200 Subject: [PATCH 5/8] Getting the active language when item is tagged to ALL --- components/com_content/helpers/route.php | 5 ----- libraries/src/Component/Router/Rules/MenuRules.php | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/components/com_content/helpers/route.php b/components/com_content/helpers/route.php index c72a00cc7a3e5..73aa1adca0ef5 100644 --- a/components/com_content/helpers/route.php +++ b/components/com_content/helpers/route.php @@ -84,11 +84,6 @@ public static function getCategoryRoute($catid, $language = 0) { $link .= '&lang=' . $language; } - else - { - $lang = Factory::getLanguage()->getTag(); - $link .= '&lang=' . $lang; - } } } diff --git a/libraries/src/Component/Router/Rules/MenuRules.php b/libraries/src/Component/Router/Rules/MenuRules.php index 140b669414df9..b2a410e23e316 100644 --- a/libraries/src/Component/Router/Rules/MenuRules.php +++ b/libraries/src/Component/Router/Rules/MenuRules.php @@ -76,6 +76,12 @@ public function preprocess(&$query) // Get query language $language = isset($query['lang']) ? $query['lang'] : '*'; + // Set the language to the active one when multilang is enabled and item is tagged to ALL + if ($active !== null && Multilanguage::isEnabled() && $language === '*') + { + $language = $active->language; + } + if (!isset($this->lookup[$language])) { $this->buildLookup($language); From 70f455ea559120e0e1e1e5ff13f51e01ebca2185 Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Sat, 1 Sep 2018 05:47:37 +0200 Subject: [PATCH 6/8] Load current language when item is set to ALL --- components/com_content/helpers/route.php | 7 ++----- libraries/src/Component/Router/Rules/MenuRules.php | 7 ++++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/components/com_content/helpers/route.php b/components/com_content/helpers/route.php index 73aa1adca0ef5..d74a37e17a055 100644 --- a/components/com_content/helpers/route.php +++ b/components/com_content/helpers/route.php @@ -78,12 +78,9 @@ public static function getCategoryRoute($catid, $language = 0) { $link = 'index.php?option=com_content&view=category&id=' . $id; - if ($language && Multilanguage::isEnabled()) + if ($language && $language !== '*' && Multilanguage::isEnabled()) { - if ($language !== '*') - { - $link .= '&lang=' . $language; - } + $link .= '&lang=' . $language; } } diff --git a/libraries/src/Component/Router/Rules/MenuRules.php b/libraries/src/Component/Router/Rules/MenuRules.php index b2a410e23e316..7892e4c8c5bad 100644 --- a/libraries/src/Component/Router/Rules/MenuRules.php +++ b/libraries/src/Component/Router/Rules/MenuRules.php @@ -12,6 +12,7 @@ use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Component\Router\RouterView; +use Joomla\CMS\Factory; use Joomla\CMS\Language\Multilanguage; /** @@ -76,10 +77,10 @@ public function preprocess(&$query) // Get query language $language = isset($query['lang']) ? $query['lang'] : '*'; - // Set the language to the active one when multilang is enabled and item is tagged to ALL - if ($active !== null && Multilanguage::isEnabled() && $language === '*') + // Set the language to the current one when multilang is enabled and item is tagged to ALL + if (Multilanguage::isEnabled() && $language === '*') { - $language = $active->language; + $language = Factory::getLanguage()->getTag(); } if (!isset($this->lookup[$language])) From f3dc6e94bedf5494dacc9265c0af449cbbde6d11 Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Sat, 1 Sep 2018 05:49:52 +0200 Subject: [PATCH 7/8] factory not used --- components/com_content/helpers/route.php | 1 - 1 file changed, 1 deletion(-) diff --git a/components/com_content/helpers/route.php b/components/com_content/helpers/route.php index d74a37e17a055..f5dfb96dadc17 100644 --- a/components/com_content/helpers/route.php +++ b/components/com_content/helpers/route.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; use Joomla\CMS\Categories\CategoryNode; -use Joomla\CMS\Factory; use Joomla\CMS\Language\Multilanguage; /** From e06a014348c9af5f1c132f727bc4bd4d5d01afa5 Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Sat, 1 Sep 2018 16:58:55 +0200 Subject: [PATCH 8/8] better code for menurules thanks @csthomas --- libraries/src/Component/Router/Rules/MenuRules.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/src/Component/Router/Rules/MenuRules.php b/libraries/src/Component/Router/Rules/MenuRules.php index 7892e4c8c5bad..999d56b12a477 100644 --- a/libraries/src/Component/Router/Rules/MenuRules.php +++ b/libraries/src/Component/Router/Rules/MenuRules.php @@ -12,7 +12,6 @@ use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Component\Router\RouterView; -use Joomla\CMS\Factory; use Joomla\CMS\Language\Multilanguage; /** @@ -80,7 +79,7 @@ public function preprocess(&$query) // Set the language to the current one when multilang is enabled and item is tagged to ALL if (Multilanguage::isEnabled() && $language === '*') { - $language = Factory::getLanguage()->getTag(); + $language = $this->router->app->get('language'); } if (!isset($this->lookup[$language]))