mirror of
https://github.com/joomla-extensions/weblinks.git
synced 2024-06-03 15:00:48 +00:00
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:
commit
12f69ad542
|
@ -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; ?>
|
||||
|
||||
|
|
|
@ -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 [];
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user