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

Update publish_up and publish_down query after null date change

This commit is contained in:
Tuan Pham Ngoc 2021-08-15 20:29:13 +07:00
parent c1f3652257
commit 2b960d4bed
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/com_weblinks/src/Model/CategoryModel.php
View File

@ -13,7 +13,6 @@ defined('_JEXEC') or die;
use Joomla\CMS\Categories\Categories;
use Joomla\CMS\Categories\CategoryNode;
use Joomla\CMS\Component\ComponentHelper;
use Joomla\CMS\Factory;
use Joomla\CMS\Helper\TagsHelper;
use Joomla\CMS\Language\Multilanguage;
@ -185,14 +184,13 @@ class CategoryModel extends ListModel
// Filter by start and end dates.
if ($this->getState('filter.publish_date'))
{
$nullDate = $db->getNullDate();
$nowDate = Factory::getDate()->toSql();
$query->where('(a.publish_up = :publishUpNullDate OR a.publish_up <= :publishUpNowDate)')
->where('(a.publish_down = :publishDownNullDate OR a.publish_down >= :publishDownNowDate)')
->bind(':publishUpNullDate', $nullDate)
->bind(':publishDownNullDate', $nullDate)
->bind(':publishUpNowDate', $nowDate)
->bind(':publishDownNowDate', $nowDate);
$nowDate = Factory::getDate()->toSql();
$query->where('(' . $db->quoteName('a.publish_up')
. ' IS NULL OR ' . $db->quoteName('a.publish_up') . ' <= :publish_up)')
->where('(' . $db->quoteName('a.publish_down')
. ' IS NULL OR ' . $db->quoteName('a.publish_down') . ' >= :publish_down)')
->bind(':publish_up', $nowDate)
->bind(':publish_down', $nowDate);
}
// Filter by language

14
src/components/com_weblinks/src/Model/WeblinkModel.php
View File

@ -124,15 +124,13 @@ class WeblinkModel extends ItemModel
if (!$user->authorise('core.edit.state', 'com_weblinks') && !$user->authorise('core.edit', 'com_weblinks'))
{
// Filter by start and end dates.
$nullDate = $db->getNullDate();
$nowDate = Factory::getDate()->toSql();
$query->where('(a.publish_up = :publishUpNullDate OR a.publish_up <= :publishUpNowDate)')
->where('(a.publish_down = :publishDownNullDate OR a.publish_down >= :publishDownNowDate)')
->bind(':publishUpNullDate', $nullDate)
->bind(':publishDownNullDate', $nullDate)
->bind(':publishUpNowDate', $nowDate)
->bind(':publishDownNowDate', $nowDate);
$query->where('(' . $db->quoteName('a.publish_up')
. ' IS NULL OR ' . $db->quoteName('a.publish_up') . ' <= :publish_up)')
->where('(' . $db->quoteName('a.publish_down')
. ' IS NULL OR ' . $db->quoteName('a.publish_down') . ' >= :publish_down)')
->bind(':publish_up', $nowDate)
->bind(':publish_down', $nowDate);
}
// Filter by published state.