asc/sportspress
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #73 Manual offset timezone not saving

Browse Source
This commit is contained in:
Brian Miyaji
2014-11-06 17:46:46 +11:00
parent e499e7c7f2
commit 4499858bcc
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
includes/admin/settings/class-sp-settings-general.php
View File

@@ -192,9 +192,19 @@ class SP_Settings_General extends SP_Settings_Page {
$settings = $this->get_settings(); $settings = $this->get_settings();
SP_Admin_Settings::save_fields( $settings ); SP_Admin_Settings::save_fields( $settings );
// Map UTC+- timezones to gmt_offsets and set timezone_string to empty.
if ( ! empty( $_POST['timezone_string'] ) && preg_match( '/^UTC[+-]/', $_POST['timezone_string'] ) ) {
$_POST['gmt_offset'] = $_POST['timezone_string'];
$_POST['gmt_offset'] = preg_replace( '/UTC\+?/', '', $_POST['gmt_offset'] );
$_POST['timezone_string'] = '';
}
if ( isset( $_POST['timezone_string'] ) ) if ( isset( $_POST['timezone_string'] ) )
update_option( 'timezone_string', $_POST['timezone_string'] ); update_option( 'timezone_string', $_POST['timezone_string'] );
if ( isset( $_POST['gmt_offset'] ) )
update_option( 'gmt_offset', $_POST['gmt_offset'] );
update_option( 'sportspress_enable_frontend_css', isset( $_POST['sportspress_enable_frontend_css'] ) ? 'yes' : 'no' ); update_option( 'sportspress_enable_frontend_css', isset( $_POST['sportspress_enable_frontend_css'] ) ? 'yes' : 'no' );
if ( isset( $_POST['sportspress_frontend_css_primary'] ) ) { if ( isset( $_POST['sportspress_frontend_css_primary'] ) ) {
@@ -231,10 +241,10 @@ class SP_Settings_General extends SP_Settings_Page {
$check_zone_info = true; $check_zone_info = true;
// Remove old Etc mappings. Fallback to gmt_offset. // Remove old Etc mappings. Fallback to gmt_offset.
if ( false !== strpos($tzstring,'Etc/GMT') ) if ( false !== strpos( $tzstring,'Etc/GMT' ) )
$tzstring = ''; $tzstring = '';
if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists if ( empty( $tzstring ) ) { // Create a UTC+- zone if no timezone string exists
$check_zone_info = false; $check_zone_info = false;
if ( 0 == $current_offset ) if ( 0 == $current_offset )
$tzstring = 'UTC+0'; $tzstring = 'UTC+0';
@@ -254,6 +264,7 @@ class SP_Settings_General extends SP_Settings_Page {
<select id="timezone_string" name="timezone_string" class="<?php echo $class; ?>"> <select id="timezone_string" name="timezone_string" class="<?php echo $class; ?>">
<?php echo wp_timezone_choice($tzstring); ?> <?php echo wp_timezone_choice($tzstring); ?>
</select> </select>
<p class="description"><?php _e( 'Choose a city in the same timezone as you.', 'sportspress' ); ?></p>
</td> </td>
</tr> </tr>
<?php <?php