unset Advent1 outside of foreach cycle!

Liturgical-Calendar · Mar 25, 2024 · a9b0238 · a9b0238
1 parent 3401c41
commit a9b0238
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/includes/FestivityCollection.php b/includes/FestivityCollection.php
@@ -594,16 +594,14 @@ public function purgeDataAdventChristmas( int|null $buffer = null ) {
         foreach( $this->festivities as $key => $festivity ) {
             if( $festivity->date > $this->festivities[ "Advent1" ]->date ) {
                 unset( $this->festivities[ $key ] );
-                    // make sure it isn't still contained in another collection
-                    unset( $this->solemnities[ $key ] );
-                    unset( $this->feasts[ $key ] );
-                    unset( $this->memorials[ $key ] );
-                    unset( $this->WeekdayAdventChristmasLent[ $key ] );
-                    unset( $this->SolemnitiesLordBVM[ $key ] );
-                    unset( $this->SundaysAdventLentEaster[ $key ] );
+                // make sure it isn't still contained in another collection
+                unset( $this->solemnities[ $key ] );
+                unset( $this->feasts[ $key ] );
+                unset( $this->memorials[ $key ] );
+                unset( $this->WeekdayAdventChristmasLent[ $key ] );
+                unset( $this->SolemnitiesLordBVM[ $key ] );
+                unset( $this->SundaysAdventLentEaster[ $key ] );
             }
-            //lastly remove First Sunday of Advent
-            unset( $this->festivities[ "Advent1" ] );
             /* Perhaps we shouldn't remove the Vigil Mass for the first Sunday of Advent?
             // also remove the Vigil Mass for the first Sunday of Advent
             if(
@@ -617,6 +615,8 @@ public function purgeDataAdventChristmas( int|null $buffer = null ) {
             }
             */
         }
+        //lastly remove First Sunday of Advent
+        unset( $this->festivities[ "Advent1" ] );
     }
 
     public function mergeFestivityCollection( FestivityCollection $festivities ) {