Ticket #1859: 1859.diff

wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php

@@ -428 +428 @@
                                 <div class="wcorg-organizer">
                                         <h2><?php the_title(); ?></h2>
                                         <div class="wcorg-organizer-description">
-                                                <?php /* Unlike speakers, organizers don't have a Gravatar e-mail field, so we pass the linked user ID to get_avatar */ ?>
-                                                <?php echo ( $attr['show_avatars'] ) ? get_avatar( absint( get_post_meta( get_the_ID(), '_wcpt_user_id', true ) ), absint( $attr['avatar_size'] ) ) : ''; ?>
+                                                <?php echo ( $attr['show_avatars'] ) ? get_avatar( get_post_meta( get_the_ID(), '_wcb_organizer_email', true ), absint( $attr['avatar_size'] ) ) : ''; ?>
                                                 <?php the_content(); ?>
                                         </div>
                                 </div>
@@ -1419 +1418 @@
          */
         function metabox_organizer_info() {
                 global $post;
+                $email = get_post_meta( $post->ID, '_wcb_organizer_email', true );
 
                 $wporg_username = '';
                 $user_id        = get_post_meta( $post->ID, '_wcpt_user_id', true );
@@ -1431 +1431 @@
                 <?php wp_nonce_field( 'edit-organizer-info', 'wcpt-meta-organizer-info' ); ?>
 
                 <p>
+                        <label for="wcpt-gravatar-email"><?php _e( 'Gravatar Email:', 'wordcamporg' ); ?></label>
+                        <input type="text" class="widefat" id="wcpt-gravatar-email" name="wcpt-gravatar-email" value="<?php echo esc_attr( $email ); ?>" />
+                </p>
+
+                <p>
                         <label for="wcpt-wporg-username"><?php _e( 'WordPress.org Username:', 'wordcamporg' ); ?></label>
                         <input type="text" class="widefat" id="wcpt-wporg-username" name="wcpt-wporg-username" value="<?php echo esc_attr( $wporg_username ); ?>" />
                 </p>
@@ -1672 +1677 @@
                         return;
 
                 if ( isset( $_POST['wcpt-meta-organizer-info'] ) && wp_verify_nonce( $_POST['wcpt-meta-organizer-info'], 'edit-organizer-info' ) ) {
+                        $email          = sanitize_text_field( $_POST['wcpt-gravatar-email'] );
                         $wporg_username = sanitize_text_field( $_POST['wcpt-wporg-username'] );
                         $wporg_user = wcorg_get_user_by_canonical_names( $wporg_username );
 
+                        if ( empty( $email ) )
+                                delete_post_meta( $post_id, '_wcb_organizer_email' );
+                        elseif ( $email && is_email( $email ) )
+                                update_post_meta( $post_id, '_wcb_organizer_email', $email );
+
                         if ( ! $wporg_user )
                                 delete_post_meta( $post_id, '_wcpt_user_id' );
                         else
@@ -2009 +2020 @@
 
                 switch ( $current_filter ) {
                         case 'manage_wcb_organizer_posts_columns':
+                                $original_columns = $columns;
+
                                 // Insert at offset 1, that's right after the checkbox.
-                                $columns = array_slice( $columns, 0, 1, true ) + array( 'wcb_organizer_avatar' => __( 'Avatar', 'wordcamporg' ) )   + array_slice( $columns, 1, null, true );
+                                $columns = array_slice( $original_columns, 0, 1, true );
+                                $columns += array( 'wcb_organizer_avatar' => __( 'Avatar', 'wordcamporg' ) );
+                                $columns += array_slice( $original_columns, 1, 1, true );
+                                $columns += array( 'wcb_organizer_email' => __( 'Gravatar Email', 'wordcamporg' );
+                                $columns += array_slice( $original_columns, 1, null, true );
                                 break;
 
                         case 'manage_wcb_speaker_posts_columns':
@@ -2050 +2067 @@
                                 edit_post_link( get_avatar( absint( get_post_meta( get_the_ID(), '_wcpt_user_id', true ) ), 32 ) );
                                 break;
 
+                        case 'wcb_organizer_email':
+                                echo esc_html( get_post_meta( get_the_ID(), '_wcb_organizer_email', true ) );
+                                break;
+
                         case 'wcb_speaker_avatar':
                                 edit_post_link( get_avatar( get_post_meta( get_the_ID(), '_wcb_speaker_email', true ), 32 ) );
                                 break;