Changeset 11861

Timestamp:

05/20/2022 08:13:02 PM (2 years ago)

Author:

iandunn

Message:

Events: Move promo_start to where it's used.

All regional camps use the same value, so it doesn't need to be set individually. Moving it here makes it simpler.

Location:

sites/trunk/api.wordpress.org/public_html/events/1.0

Files:

• index.php (modified) (2 diffs)
• tests/test-index.php (modified) (1 diff)

sites/trunk/api.wordpress.org/public_html/events/1.0/index.php

@@ -1199 +1199 @@
     );
 
-    // `promo_start` should be 2 months before the Event's start date. See `maybe_add_regional_wordcamps()`.
-    foreach ( $events as & $event ) {
-        $event['promo_start'] = strtotime( $event['event']['date'] . ' - 2 months' );
-    }
-
     return $events;
 }
@@ -1285 +1280 @@
 
     foreach ( $region_data as $region => $data ) {
-        if ( empty( $data['promo_start'] ) ) {
-            continue;
-        }
-
-        $promo_start = $data['promo_start'];
-
-        /**
-         * The targeted area of the regional camp promotion "zooms in" over the course of 6 weeks.
-         */
+        $promo_start = strtotime( $data['event']['date'] . ' - 2 months' );
+
+        // The targeted area of the regional camp promotion "zooms in" over the course of 6 weeks.
         if ( is_within_date_range( $current_time, $promo_start, strtotime( '+ 2 weeks', $promo_start ) ) ) {
             // Phase 1: Show worldwide for the first two weeks of the promo (8-6 weeks before the event).

sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php

@@ -176 +176 @@
         $region_data = array(
             'us' => array(
-                'promo_start' => strtotime( '2019-08-16 00:00:00' ),
-
                 'regional_countries' => array_merge(
                     get_iso_3166_2_country_codes( 'south america' ),