joomla
/
weblinks
mirror of https://github.com/joomla-extensions/weblinks.git
30
1
Fork 0
Code Issues Releases Activity

Merge pull request #448 from joomdonation/bring_some_changes_from_master_to_4.0-dev 

[4.0] Bring some changes from master to 4.0 dev
This commit is contained in:
Tuan Pham Ngoc 2021-08-18 17:27:33 +07:00 committed by GitHub
parent ac0bee47a5 1f0611a4f3
commit 12f69ad542
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/com_weblinks/tmpl/category/default_items.php
View File

@ -17,9 +17,6 @@ use Joomla\CMS\Uri\Uri;
HTMLHelper::_('behavior.core');
// Create a shortcut for params.
$params = &$this->category->params;
// Get the user object.
$user = Factory::getApplication()->getIdentity();
@ -78,7 +75,7 @@ $listDirn = $this->escape($this->state->get('list.direction'));
<?php if ($canEdit || ($canEditOwn && $item->created_by == $userId)) : ?>
<div class="icons list-group-item">
<?php echo HTMLHelper::_('weblinkicon.edit', $item, $this->params); ?>
<?php echo HTMLHelper::_('weblinkicon.edit', $item, $item->params); ?>
</div>
<?php endif; ?>

4
src/modules/mod_weblinks/src/Helper/WeblinksHelper.php
View File

@ -87,7 +87,7 @@ class WeblinksHelper
$model->setState(
'list.select',
'a.*, c.published AS c_published,' . $case_when1 . ',' . $case_when2 . ', a.created'
'a.*, c.description AS c_description, c.published AS c_published,' . $case_when1 . ',' . $case_when2 . ', a.created'
);
$model->setState('filter.c.published', 1);
@ -114,6 +114,6 @@ class WeblinksHelper
return $items;
}
return;
return [];
}
}