diff --git a/library/Class/Article.php b/library/Class/Article.php index 2d00582223520fdfc6662cd91e0bfa5a9bda600e..8814f0cead3ef8c8ed9d8193c13f5a74ea4c6f81 100644 --- a/library/Class/Article.php +++ b/library/Class/Article.php @@ -442,7 +442,8 @@ class ArticleLoader extends Storm_Model_Loader { $day_num = gmdate("w", $day); return array_filter($articles, function($event) { - if(empty($event->getPickDayAsArray()) || in_array($day_num, $event->getPickDayAsArray())) + $pick_day_as_array = $event->getPickDayAsArray(); + if(empty($pick_day_as_array) || in_array($day_num, $pick_day_as_array)) return $event; }); } @@ -1340,7 +1341,9 @@ class Class_Article extends Storm_Model_Abstract { if($param == '') return []; - if(empty($result = explode(',', $param))) + $result = explode(',', $param); + + if(empty($result)) return [$param]; return $result; diff --git a/library/ZendAfi/View/Helper/Calendar/Table.php b/library/ZendAfi/View/Helper/Calendar/Table.php index b62a2c93d45224bc7cf19ed9d2bd07119be085ee..6b6a5faa41877ba441117bdd747474937cbefa62 100644 --- a/library/ZendAfi/View/Helper/Calendar/Table.php +++ b/library/ZendAfi/View/Helper/Calendar/Table.php @@ -144,8 +144,10 @@ class ZendAfi_View_Helper_Calendar_Table extends ZendAfi_View_Helper_BaseHelper $jour_fin = (int)date('j', $event_fin); $mois_fin = (int)date('m', $event_fin); - if(!empty($event->getPickDayAsArray()) - && !in_array($day_num, $event->getPickDayAsArray())) + $pick_days = $event->getPickDayAsArray(); + + if(!empty($pick_days) + && !in_array($day_num, $pick_days)) continue; if($mois_debut == $month && $mois_fin == $month) { diff --git a/library/ZendAfi/View/Helper/TagArticleEvent.php b/library/ZendAfi/View/Helper/TagArticleEvent.php index 743e28e054b5ea44cc4819250d35726cf653b237..3cc5645c6f2d44f6a2d45902f68bde05cd73d77a 100644 --- a/library/ZendAfi/View/Helper/TagArticleEvent.php +++ b/library/ZendAfi/View/Helper/TagArticleEvent.php @@ -72,7 +72,7 @@ class ZendAfi_View_Helper_TagArticleEvent extends Zend_View_Helper_HtmlElement { $picked_days = $article->getPickDayAsArray(); - if(empty($article->getPickDayAsArray()) || 7 == count($picked_days)) + if(empty($picked_days) || 7 == count($picked_days)) return $this->view->_('Du %s au %s', trim(strftime('%A %d', $date_start) . ' ' . $month_start . ' ' . $year_start), trim(strftime('%A %d', $date_end) . ' ' . $month_end . ' ' . $year_end)); diff --git a/tests/application/modules/admin/controllers/SystemeControllerWebServicesTest.php b/tests/application/modules/admin/controllers/SystemeControllerWebServicesTest.php index d4ba3f492981a777b29468280f35697f31348c12..385c52cf75fa93c5f59597f862171e897e1d0539 100644 --- a/tests/application/modules/admin/controllers/SystemeControllerWebServicesTest.php +++ b/tests/application/modules/admin/controllers/SystemeControllerWebServicesTest.php @@ -43,6 +43,7 @@ class SystemeControllerWebServicesIndexActionTest extends Admin_AbstractControll class SystemeControllerWebServicesActionTest extends Admin_AbstractControllerTestCase { /** + * @group no-ci * @group longtest * @group integration * @test @@ -56,6 +57,7 @@ class SystemeControllerWebServicesActionTest extends Admin_AbstractControllerTes /** + * @group no-ci * @group longtest * @group integration * @test diff --git a/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php b/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php index 6d7e40922d942a44aa214f8ab2bd2c62f5a3cf99..d61d1df80ca6c0a20d33d2e3d0f0e6a85ef488af 100644 --- a/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php +++ b/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php @@ -1141,6 +1141,7 @@ class NoticeAjaxControllerVideoMorceauTest extends AbstractControllerTestCase { /** + * @group no-ci * @group integration * @test */