File tree Expand file tree Collapse file tree 2 files changed +12
-32
lines changed Expand file tree Collapse file tree 2 files changed +12
-32
lines changed Original file line number Diff line number Diff line change 24
24
25
25
if ( ! empty ( $ api ) ) {
26
26
$ profile = $ api ->get ( '' );
27
- $ email = $ profile ['email ' ] ?? $ email ;
27
+ if ( ! is_wp_error ( $ profile ) ) {
28
+ $ email = $ profile ['email ' ] ?? $ email ;
29
+ }
28
30
}
29
31
30
32
// Prepare data for prefilling the form.
209
211
</div>
210
212
</div>
211
213
</div>
212
-
213
- <div class="form-row">
214
- <div class="box">
215
- <label for="timezone">
216
- <span><?php esc_html_e ( 'Timezone ' , 'mailchimp ' ); ?> </span>
217
- </label>
218
- <div class="mailchimp-select-wrapper">
219
- <select id="timezone" name="timezone" required>
220
- <?php
221
- $ selected_timezone = $ data ['timezone ' ];
222
- foreach ( $ timezones as $ timezone ) {
223
- ?>
224
- <option value="<?php echo esc_attr ( $ timezone ['zone ' ] ); ?> " <?php selected ( $ timezone ['zone ' ] === $ selected_timezone , true ); ?> >
225
- <?php echo esc_html ( $ timezone ['diff_from_GMT ' ] . ' - ' . $ timezone ['zone ' ] ); ?>
226
- </option>
227
- <?php
228
- }
229
- ?>
230
- </select>
231
- </div>
232
- </div>
233
- </div>
234
214
</fieldset>
215
+ <?php
216
+ $ timezone = 'UTC ' ;
217
+ $ selected_timezone = $ data ['timezone ' ];
218
+ if ( in_array ( $ selected_timezone , $ timezones , true ) ) {
219
+ $ timezone = $ selected_timezone ;
220
+ }
221
+ ?>
222
+ <input type="hidden" id="timezone" name="timezone" value="<?php echo esc_attr ( $ timezone ); ?> "/>
235
223
</div>
236
224
</div>
237
225
Original file line number Diff line number Diff line change @@ -474,15 +474,7 @@ public function create_account_page() {
474
474
* @return array
475
475
*/
476
476
private function get_timezones () {
477
- $ zones_array = array ();
478
- foreach ( timezone_identifiers_list () as $ key => $ zone ) {
479
- $ timezone = new DateTimeZone ( $ zone );
480
- $ diff_string = ( new DateTime ( 'now ' , $ timezone ) )->format ( 'P ' );
481
- $ zones_array [ $ key ]['zone ' ] = $ zone ;
482
- $ zones_array [ $ key ]['diff_from_GMT ' ] = 'UTC/GMT ' . $ diff_string ;
483
- }
484
-
485
- return $ zones_array ;
477
+ return timezone_identifiers_list ();
486
478
}
487
479
488
480
/**
You can’t perform that action at this time.
0 commit comments