mirror of
https://github.com/joomla-extensions/weblinks.git
synced 2025-01-27 14:28:30 +00:00
Bring some changes from master to 4.0-dev
This commit is contained in:
parent
ac0bee47a5
commit
1f0611a4f3
@ -17,9 +17,6 @@ use Joomla\CMS\Uri\Uri;
|
|||||||
|
|
||||||
HTMLHelper::_('behavior.core');
|
HTMLHelper::_('behavior.core');
|
||||||
|
|
||||||
// Create a shortcut for params.
|
|
||||||
$params = &$this->category->params;
|
|
||||||
|
|
||||||
// Get the user object.
|
// Get the user object.
|
||||||
$user = Factory::getApplication()->getIdentity();
|
$user = Factory::getApplication()->getIdentity();
|
||||||
|
|
||||||
@ -78,7 +75,7 @@ $listDirn = $this->escape($this->state->get('list.direction'));
|
|||||||
|
|
||||||
<?php if ($canEdit || ($canEditOwn && $item->created_by == $userId)) : ?>
|
<?php if ($canEdit || ($canEditOwn && $item->created_by == $userId)) : ?>
|
||||||
<div class="icons list-group-item">
|
<div class="icons list-group-item">
|
||||||
<?php echo HTMLHelper::_('weblinkicon.edit', $item, $this->params); ?>
|
<?php echo HTMLHelper::_('weblinkicon.edit', $item, $item->params); ?>
|
||||||
</div>
|
</div>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
|
||||||
|
@ -87,7 +87,7 @@ class WeblinksHelper
|
|||||||
|
|
||||||
$model->setState(
|
$model->setState(
|
||||||
'list.select',
|
'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);
|
$model->setState('filter.c.published', 1);
|
||||||
@ -114,6 +114,6 @@ class WeblinksHelper
|
|||||||
return $items;
|
return $items;
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return [];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user