Skip to content
Snippets Groups Projects

Master

Merged Ghislain Loas requested to merge master into dev#33757_gestion_des_preferences_de_l_utilisateur
Compare and
+ 13
5
Preferences
Compare changes
Files
+ 5
2
@@ -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;