[com_banners] - publishing time does not honor timezone (#11978)

* [com_banners ] - publishing time does not honor timezone * impress only when needed impress only when needed * CS fix cs fix
joomla · Sep 16, 2016 · c5102ea · c5102ea
1 parent 7fc63d2
commit c5102ea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/components/com_banners/models/banners.php b/components/com_banners/models/banners.php
@@ -64,6 +64,7 @@ protected function getListQuery()
 		$keywords   = $this->getState('filter.keywords');
 		$randomise  = ($ordering == 'random');
 		$nullDate   = $db->quote($db->getNullDate());
+		$nowDate    = $db->quote(JFactory::getDate()->toSql());
 
 		$query->select(
 			'a.id as id,'
@@ -80,8 +81,8 @@ protected function getListQuery()
 			->from('#__banners as a')
 			->join('LEFT', '#__banner_clients AS cl ON cl.id = a.cid')
 			->where('a.state=1')
-			->where('(' . $query->currentTimestamp() . ' >= a.publish_up OR a.publish_up = ' . $nullDate . ')')
-			->where('(' . $query->currentTimestamp() . ' <= a.publish_down OR a.publish_down = ' . $nullDate . ')')
+			->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+			->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')')
 			->where('(a.imptotal = 0 OR a.impmade <= a.imptotal)');
 
 		if ($cid)

diff --git a/modules/mod_banners/helper.php b/modules/mod_banners/helper.php
@@ -42,7 +42,11 @@ public static function &getList(&$params)
 		$model->setState('filter.language', $app->getLanguageFilter());
 
 		$banners = $model->getItems();
-		$model->impress();
+
+		if ($banners)
+		{
+			$model->impress();
+		}
 
 		return $banners;
 	}