Ticket #6913: time_format_6913.diff

wp-admin/includes/post.php

@@ -81 +81 @@
-                }
-        }
-
+        // Let's handle the conversion to 24 hour time if the user has chosen 12 hour for posting
+        if( !empty( $_POST['time_format'] ) && $_POST['time_format'] == '12_hour' ) {
+                // If only the meridiem has been switched, we still need to update the time...
+                if( !empty( $_POST['hidden_meridiem'] ) && $_POST['hidden_meridiem'] != $_POST['meridiem'] )
+                        $_POST['edit_date'] = '1';
+                
+                // "Convert" hour back to 24-hour format if necessary, taking the meridiem into account...
+                if ( !empty( $_POST['time_format'] ) && $_POST['time_format'] == '12_hour' ) {
+                        
+                        // If the user accidentally enters a 24-hour time then we implicitly fix it for him
+                        $_POST['hh'] = $_POST['hh'] <= 12 ? $_POST['hh'] : $_POST['hh'] - 12;
+                        
+                        if ( $_POST['meridiem'] == 'pm' ) {
+                                $_POST['hh'] += 12;
+                        }
+                }
+        }
+                
-        if (!empty ( $_POST['edit_date'] ) ) {
-                $aa = $_POST['aa'];
-                $mm = $_POST['mm'];

wp-admin/includes/template.php

@@ -844 +844 @@
-
-        $time_adj = time() + (get_option( 'gmt_offset' ) * 3600 );
-        $post_date = ($for_post) ? $post->post_date : $comment->comment_date;
+        $time_format = get_user_option('time_format');
+        $hour_format = $time_format == '12_hour' ? 'g' : 'H';
-        $jj = ($edit) ? mysql2date( 'd', $post_date ) : gmdate( 'd', $time_adj );
-        $mm = ($edit) ? mysql2date( 'm', $post_date ) : gmdate( 'm', $time_adj );
-        $aa = ($edit) ? mysql2date( 'Y', $post_date ) : gmdate( 'Y', $time_adj );
-'H', $post_date ) : gmdate( 'H'
+$hour_format, $post_date ) : gmdate( $hour_format
-        $mn = ($edit) ? mysql2date( 'i', $post_date ) : gmdate( 'i', $time_adj );
-        $ss = ($edit) ? mysql2date( 's', $post_date ) : gmdate( 's', $time_adj );
-
+
+
+
+
+
+
+
-        $month = "<select id=\"mm\" name=\"mm\"$tab_index_attribute>\n";
-        for ( $i = 1; $i < 13; $i = $i +1 ) {
-                $month .= "\t\t\t" . '<option value="' . zeroise($i, 2) . '"';
@@ -864 +872 @@
-        $year = '<input type="text" id="aa" name="aa" value="' . $aa . '" size="4" maxlength="5"' . $tab_index_attribute . ' autocomplete="off"  />';
-        $hour = '<input type="text" id="hh" name="hh" value="' . $hh . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off"  />';
-        $minute = '<input type="text" id="mn" name="mn" value="' . $mn . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off"  />';
+        
+        if( '12_hour' == $time_format ) {
+                $am_selected = $meridiem == 'am' ? 'selected="selected"' : '';
+                $pm_selected = $meridiem == 'pm' ? 'selected="selected"' : '';
+                
+                $meridiem_drop_down = '<select name="meridiem" id="meridiem"' . $tab_index_attribute . '>' . PHP_EOL;
+                $meridiem_drop_down .= '        <option value="am" ' . $am_selected . '>' . $locale_am . '</option>' . PHP_EOL;
+                $meridiem_drop_down .= '        <option value="pm" ' . $pm_selected . '>' . $locale_pm . '</option>' . PHP_EOL;
+                $meridiem_drop_down .= '</selected>' . PHP_EOL;
+        }
+        
-        printf(_c('%1$s%2$s, %3$s <br />@ %4$s : %5$s|1: month input, 2: day input, 3: year input, 4: hour input, 5: minute input'), $month, $day, $year, $hour, $minute);
+        
+        if ( '12_hour' == $time_format )
+                echo $meridiem_drop_down;
+        
-        echo "\n\n";
-        foreach ( array('mm', 'jj', 'aa', 'hh', 'mn') as $timeunit )
-                echo '<input type="hidden" id="hidden_' . $timeunit . '" name="hidden_' . $timeunit . '" value="' . $$timeunit . '" />' . "\n";
+
+        if( '12_hour' == $time_format )
+                echo '<input type="hidden" id="hidden_meridiem" name="hidden_meridiem" value="' . $meridiem . '" />';
+
-?>
-
-<input type="hidden" id="ss" name="ss" value="<?php echo $ss ?>" size="2" maxlength="2" />
+<input type="hidden" id="time_format" name="time_format" value="<?php echo $time_format; ?>" />
-<?php
-}
-

wp-admin/includes/user.php

@@ -80 +80 @@
-        else
-                $user->admin_color = 'fresh';
-
+        if ( !update )
+                $user->time_format = '24_hour'; // Default to 24 hour time for new users.
+        else if ( isset( $_POST['time_format'] ) )
+                $user->time_format = $_POST['time_format'];
+        else
+                $user->time_format = '24_hour';
+                
-        $errors = new WP_Error();
-
-        /* checking that username has been typed */

wp-admin/user-edit.php

@@ -161 +161 @@
-        </tr>
-<?php endif; ?>
-<tr>
+<th scope="row"><?php _e('Editor Time Format')?></th>
+<td>
+        <?php 
+                $current_time_format = get_user_option('time_format', $user_id);
+                if ( !empty($current_time_format) && $current_time_format != '24_hour' && $current_time_format != '12_hour' )
+                        $current_time_format = '24_hour';
+        ?>
+        <label for="time_format_12"><input name="time_format" id="time_format_12" type="radio" value="12_hour" <?php checked('12_hour', $current_time_format);?> />12-hour <i>2:35pm</i></label><br />
+        <label for="time_format_24"><input name="time_format" id="time_format_24" type="radio" value="24_hour" <?php checked('24_hour', $current_time_format);?> />24-hour <i>14:35</i></label><br />
+</td>
+</tr>
+<tr>
-<th scope="row"><?php _e('Admin Color Scheme')?></th>
-<td>
-<?php

wp-includes/registration.php

@@ -91 +91 @@
- * 'jabber' - User's Jabber account.
- * 'aim' - User's AOL IM account.
- * 'yim' - User's Yahoo IM account.
+ * 'time_format' - A string used to set the user's chosen time format for the editor (12_hour or 24_hour)
- *
- * @since 2.0.0
- * @uses $wpdb WordPress database layer.
@@ -157 +158 @@
-        if ( empty($admin_color) )
-                $admin_color = 'fresh';
-        $admin_color = preg_replace('|[^a-z0-9 _.\-@]|i', '', $admin_color);
-
+
+
+
+
+
+
+
+
+
-        if ( empty($user_registered) )
-                $user_registered = gmdate('Y-m-d H:i:s');
-
@@ -181 +190 @@
-        update_usermeta( $user_id, 'yim', $yim );
-        update_usermeta( $user_id, 'rich_editing', $rich_editing);
-        update_usermeta( $user_id, 'admin_color', $admin_color);
+        update_usermeta( $user_id, 'time_format', $time_format);
-
-        if ( $update && isset($role) ) {
-                $user = new WP_User($user_id);