Fix announcements display; move to Carbon instead of strings for date…

… representations
pkp · Dec 7, 2024 · 9ca4c44 · 9ca4c44
1 parent b8e3419
commit 9ca4c44
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/classes/announcement/Announcement.php b/classes/announcement/Announcement.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file classes/announcement/Announcement.php
  *
@@ -15,6 +16,7 @@
 
 use APP\core\Application;
 use APP\file\PublicFileManager;
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
@@ -166,13 +168,14 @@ protected function scopeWithTypeIds(EloquentBuilder $builder, array $typeIds): E
     }
 
     /**
+     * Limit returned announcements to those that have not expired by the specified date.
      *
      * @param string $date Optionally filter announcements by those
-     *    not expired until $date (YYYY-MM-DD)
+     *    not expired until $date
      */
-    protected function scopeWithActiveByDate(EloquentBuilder $builder, string $date = ''): EloquentBuilder
+    protected function scopeWithActiveByDate(EloquentBuilder $builder, Carbon $date = null): EloquentBuilder
     {
-        return $builder->where('date_expire', '>', empty($date) ? Core::getCurrentDate() : $date)
+        return $builder->where('date_expire', '>', $date ?? Carbon::now())
             ->orWhereNull('date_expire');
     }
 

diff --git a/pages/index/PKPIndexHandler.php b/pages/index/PKPIndexHandler.php
@@ -46,7 +46,7 @@ protected function _setupAnnouncements(Context|Site $contextOrSite, $templateMgr
             $announcements->withContextIds($contextIds);
 
             $templateMgr->assign([
-                'announcements' => $announcements->get()->toArray(),
+                'announcements' => $announcements->get(),
                 'numAnnouncementsHomepage' => $numAnnouncementsHomepage,
             ]);
         }