diff --git a/public/main/admin/system_announcements.php b/public/main/admin/system_announcements.php index 2a316a5be0..4ee83c45c0 100644 --- a/public/main/admin/system_announcements.php +++ b/public/main/admin/system_announcements.php @@ -308,7 +308,7 @@ if ($action_todo) { $form->addHidden('action', 'edit'); } $form->addElement('checkbox', 'send_email_test', null, get_lang('Send an email to myself for testing purposes.')); - $form->addButtonSend($text, 'submit'); + $form->addButtonSend($text); $form->setDefaults($values); if ($form->validate()) { @@ -420,7 +420,6 @@ if ($action_todo) { } if ($show_announcement_list) { - var_dump(api_get_url_entity()->getId()); $criteria = ['url' => api_get_url_entity()]; $announcements = $repo->findBy($criteria); $announcement_data = []; diff --git a/public/main/inc/lib/formvalidator/Element/DateRangePicker.php b/public/main/inc/lib/formvalidator/Element/DateRangePicker.php index ea7ed3524f..731a6bea66 100644 --- a/public/main/inc/lib/formvalidator/Element/DateRangePicker.php +++ b/public/main/inc/lib/formvalidator/Element/DateRangePicker.php @@ -51,7 +51,7 @@ class DateRangePicker extends HTML_QuickForm_text ); } - public function parseDateRange(array $dateRange): array + public function parseDateRange(string $dateRange): array { $dateRange = Security::remove_XSS($dateRange); $dates = explode('/', $dateRange); @@ -140,7 +140,7 @@ class DateRangePicker extends HTML_QuickForm_text { $js = null; $id = $this->getAttribute('id'); - $dateRange = $this->getAttribute('value'); + $dateRange = (string) $this->getAttribute('value'); $defaultDates = null; if (!empty($dateRange)) { diff --git a/public/main/inc/lib/system_announcements.lib.php b/public/main/inc/lib/system_announcements.lib.php index f3e951db4a..add70b6795 100644 --- a/public/main/inc/lib/system_announcements.lib.php +++ b/public/main/inc/lib/system_announcements.lib.php @@ -336,12 +336,11 @@ class SystemAnnouncementManager $promotionId = 0 ) { $sysRepo = Container::getSysAnnouncementRepository(); - /** @var SysAnnouncement $announcement */ + /** @var SysAnnouncement|null $announcement */ $announcement = $sysRepo->find($id); if (null === $announcement) { return false; } - $a_dateS = explode(' ', $date_start); $a_arraySD = explode('-', $a_dateS[0]); $a_arraySH = explode(':', $a_dateS[1]);