Ticket #1084: 1084.diff

inc/back-compat.php

@@ -22 +22 @@
                 // Initialize only if theme requires.
                 if ( in_array( $this->stylesheet, $compat_themes ) || in_array( $this->template, $compat_themes ) ) {
                         $old_site_id         = get_current_blog_id() <= apply_filters( 'wcb_back_compat_max_site_id', 528 );
-                        $old_site_exceptions = array( 465, 496, 514, 518 ); // denver.wordcamp.org/2015, seattle.wordcamp.org/2015-experienced, montreal.wordcamp.org/2015, montreal.wordcamp.org/2015-fr
+                        $old_site_exceptions = array( 465, 496, 514, 518, 504 ); // denver.wordcamp.org/2015, seattle.wordcamp.org/2015-experienced, montreal.wordcamp.org/2015, montreal.wordcamp.org/2015-fr, europe.wordcamp.org/2015
                         $old_site_excepted   = in_array( get_current_blog_id(), apply_filters( 'wcb_back_compat_site_id_exceptions', $old_site_exceptions ) );
 
                         // Substitute back-compat shortcodes on older sites, but let new sites use the real ones

wc-post-types.php

@@ -54 +54 @@
                 add_filter( 'the_content', array( $this, 'add_session_info_to_speaker_posts' ) );
 
                 add_filter( 'dashboard_glance_items', array( $this, 'glance_items' ) );
+                add_filter( 'option_default_comment_status', array( $this, 'default_comment_ping_status' ) );
+                add_filter( 'option_default_ping_status', array( $this, 'default_comment_ping_status' ) );
         }
 
         function init() {
@@ -1712 +1714 @@
                 register_post_type( 'wcb_speaker', array(
                         'labels'            => $labels,
                         'rewrite'           => array( 'slug' => 'speaker', 'with_front' => true ),
-                        'supports'          => array( 'title', 'editor', 'revisions' ),
+                        'supports'          => array( 'title', 'editor', 'revisions', 'comments' ),
                         'menu_position'     => 20,
                         'public'            => true,
                         'show_ui'           => true,
@@ -2033 +2035 @@
 
                 return $items;
         }
+
+        /**
+         * Comments and pings on speakers closed by default.
+         *
+         * @param string $status Default comment status.
+         * @return string Resulting status.
+         */
+        public function default_comment_ping_status( $status ) {
+                $screen = get_current_screen();
+                if ( ! empty( $screen->post_type ) && $screen->post_type == 'wcb_speaker' )
+                        $status = 'closed';
+
+                return $status;
+        }
 }
 
 // Load the plugin class.