Skip to content

[4.0] Follow-up adding category language to getCategoryRoute() #22022

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
laoneo merged 2 commits into from
Sep 11, 2018
Merged

[4.0] Follow-up adding category language to getCategoryRoute() #22022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
899aba1
[4.0] Follow-up adding category language to getCategoryRoute()
infograf768 Sep 6, 2018
3dec83b
also for search categories plugin
infograf768 Sep 6, 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
2 changes: 1 addition & 1 deletion components/com_contact/View/Contact/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ protected function _prepareDocument()

while ($category && ($menu->query['option'] !== 'com_contact' || $menu->query['view'] === 'contact' || $id != $category->id) && $category->id > 1)
{
$path[] = array('title' => $category->title, 'link' => ContactHelperRoute::getCategoryRoute($this->contact->catid));
$path[] = array('title' => $category->title, 'link' => ContactHelperRoute::getCategoryRoute($category->id, $category->language));
$category = $category->getParent();
}

Expand Down
2 changes: 1 addition & 1 deletion components/com_newsfeeds/View/Category/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ protected function prepareDocument()

while (($menu->query['option'] !== 'com_newsfeeds' || $menu->query['view'] === 'newsfeed' || $id != $category->id) && $category->id > 1)
{
$path[] = array('title' => $category->title, 'link' => NewsfeedsHelperRoute::getCategoryRoute($category->id));
$path[] = array('title' => $category->title, 'link' => NewsfeedsHelperRoute::getCategoryRoute($category->id, $category->language));
$category = $category->getParent();
}

Expand Down
2 changes: 1 addition & 1 deletion components/com_newsfeeds/tmpl/category/default_children.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<?php if ($this->params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) : ?>
<li>
<span class="item-title">
<a href="<?php echo Route::_(NewsfeedsHelperRoute::getCategoryRoute($child->id)); ?>">
<a href="<?php echo Route::_(NewsfeedsHelperRoute::getCategoryRoute($child->id, $child->language)); ?>">
<?php echo $this->escape($child->title); ?>
</a>
</span>
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_articles_categories/tmpl/default_items.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
foreach ($list as $item) : ?>
<li<?php if ($id == $item->id && $view == 'category' && $option == 'com_content') echo ' class="active"'; ?>> <?php $levelup = $item->level - $startLevel - 1; ?>
<h<?php echo $params->get('item_heading') + $levelup; ?>>
<a href="<?php echo Route::_(ContentHelperRoute::getCategoryRoute($item->id)); ?>">
<a href="<?php echo Route::_(ContentHelperRoute::getCategoryRoute($item->id, $item->language)); ?>">
<?php echo $item->title; ?>
<?php if ($params->get('numitems')) : ?>
(<?php echo $item->numitems; ?>)
Expand Down
2 changes: 1 addition & 1 deletion modules/mod_articles_category/Helper/ArticlesCategoryHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ public static function getList(&$params)

if ($item->catid)
{
$item->displayCategoryLink = Route::_(\ContentHelperRoute::getCategoryRoute($item->catid));
$item->displayCategoryLink = Route::_(\ContentHelperRoute::getCategoryRoute($item->catid, $item->category_language));
$item->displayCategoryTitle = $show_category ? '<a href="' . $item->displayCategoryLink . '">' . $item->category_title . '</a>' : '';
}
else
Expand Down
6 changes: 3 additions & 3 deletions plugins/search/categories/categories.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,14 +154,14 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu

$query->select('a.title, a.description AS text, a.created_time AS created')
->select($db->quote('2') . ' AS browsernav')
->select('a.id AS catid')
->select('a.id AS catid, a.language AS category_language')
->select($case_when)
->from($db->quoteName('#__categories', 'a'))
->where(
'(a.title LIKE ' . $text . ' OR a.description LIKE ' . $text . ') AND a.published IN (' . implode(',', $state) . ') AND a.extension = '
. $db->quote('com_content') . 'AND a.access IN (' . $groups . ')'
)
->group('a.id, a.title, a.description, a.alias, a.created_time')
->group('a.id, a.title, a.description, a.alias, a.created_time, a.language')
->order($order);

if ($app->isClient('site') && Multilanguage::isEnabled())
Expand Down Expand Up @@ -189,7 +189,7 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
{
if (searchHelper::checkNoHtml($row, $searchText, array('name', 'title', 'text')))
{
$row->href = ContentHelperRoute::getCategoryRoute($row->slug);
$row->href = ContentHelperRoute::getCategoryRoute($row->slug, $row->category_language);
$row->section = Text::_('JCATEGORY');

$return[] = $row;
Expand Down