Changeset 2557

Timestamp:

10/14/2010 02:37:34 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Replace 'topic_reply' references with 'reply' (this includes the post_type ID)

Location:

branches/plugin

Files:

• bbp-admin.php (modified) (4 diffs)
• bbp-loader.php (modified) (5 diffs)
• bbp-templatetags.php (modified) (4 diffs)

branches/plugin/bbp-admin.php

@@ -117 +117 @@
                         __( 'Topic', 'bbpress' ),
                         'bbp_topic_reply_metabox',
-                        BBP_TOPIC_REPLY_POST_TYPE_ID,
+                        BBP_REPLY_POST_TYPE_ID,
                         'normal'
                 );
@@ -159 +159 @@
                 $forum_class       = sanitize_html_class( BBP_FORUM_POST_TYPE_ID );
                 $topic_class       = sanitize_html_class( BBP_TOPIC_POST_TYPE_ID );
-                $topic_reply_class = sanitize_html_class( BBP_TOPIC_REPLY_POST_TYPE_ID );
+                $reply_class = sanitize_html_class( BBP_REPLY_POST_TYPE_ID );
 
                 // Calculate offset for screen_icon sprite
-                $icons32_offset = -90 * array_search( $_GET['post_type'], array( BBP_FORUM_POST_TYPE_ID, BBP_TOPIC_POST_TYPE_ID, BBP_TOPIC_REPLY_POST_TYPE_ID ) );
+                $icons32_offset = -90 * array_search( $_GET['post_type'], array( BBP_FORUM_POST_TYPE_ID, BBP_TOPIC_POST_TYPE_ID, BBP_REPLY_POST_TYPE_ID ) );
 
 ?>
@@ -183 +183 @@
                         }
 
-                        #menu-posts-<?php echo $topic_reply_class; ?> .wp-menu-image {
+                        #menu-posts-<?php echo $reply_class; ?> .wp-menu-image {
                                 background: url(<?php echo $menu_icon_url; ?>) no-repeat -35px -32px;
                         }
-                        #menu-posts-<?php echo $topic_reply_class; ?>:hover .wp-menu-image,
-                        #menu-posts-<?php echo $topic_reply_class; ?>.wp-has-current-submenu .wp-menu-image {
+                        #menu-posts-<?php echo $reply_class; ?>:hover .wp-menu-image,
+                        #menu-posts-<?php echo $reply_class; ?>.wp-has-current-submenu .wp-menu-image {
                                 background: url(<?php echo $menu_icon_url; ?>) no-repeat -35px 0px;
                         }
 
-                        <?php if ( in_array ( $_GET['post_type'], array( BBP_FORUM_POST_TYPE_ID, BBP_TOPIC_POST_TYPE_ID, BBP_TOPIC_REPLY_POST_TYPE_ID ) ) ) : ?>
+                        <?php if ( in_array ( $_GET['post_type'], array( BBP_FORUM_POST_TYPE_ID, BBP_TOPIC_POST_TYPE_ID, BBP_REPLY_POST_TYPE_ID ) ) ) : ?>
                         #icon-edit, #icon-post {
                                 background: url(<?php echo BBP_IMAGES_URL . '/icons32.png'; ?>) no-repeat -4px <?php echo $icons32_offset; ?>px;
@@ -387 +387 @@
          */     
         function post_row_actions ( $actions, $post ) {
-                if ( in_array( $post->post_type, array( BBP_TOPIC_POST_TYPE_ID, BBP_TOPIC_REPLY_POST_TYPE_ID ) ) )
+                if ( in_array( $post->post_type, array( BBP_TOPIC_POST_TYPE_ID, BBP_REPLY_POST_TYPE_ID ) ) )
                         unset( $actions['inline hide-if-no-js'] );
 

branches/plugin/bbp-loader.php

@@ -89 +89 @@
 
                 // The default topic post type ID
-                if ( !defined( 'BBP_TOPIC_REPLY_POST_TYPE_ID' ) )
-                        define( 'BBP_TOPIC_REPLY_POST_TYPE_ID', apply_filters( 'bbp_topic_reply_post_type_id', 'bbp_topic_reply' ) );
+                if ( !defined( 'BBP_REPLY_POST_TYPE_ID' ) )
+                        define( 'BBP_REPLY_POST_TYPE_ID', apply_filters( 'bbp_reply_post_type_id', 'bbp_reply' ) );
 
                 // The default topic post type ID
@@ -333 +333 @@
 
                 // Topic reply post type labels
-                $topic_reply_labels = array (
+                $reply_labels = array (
                         'name'                  => __( 'Replies', 'bbpress' ),
                         'singular_name'         => __( 'Reply', 'bbpress' ),
@@ -350 +350 @@
 
                 // Topic post type rewrite
-                $topic_reply_rewrite = array (
-                        'slug'              => BBP_REPLY_SLUG,
-                        'with_front'        => false
+                $reply_rewrite = array (
+                        'slug'        => BBP_REPLY_SLUG,
+                        'with_front'  => false
                 );
 
                 // Topic post type supports
-                $topic_reply_supports = array (
+                $reply_supports = array (
                         'title',
                         'editor',
@@ -365 +365 @@
                 // Register topic reply post type
                 register_post_type (
-                        BBP_TOPIC_REPLY_POST_TYPE_ID,
+                        BBP_REPLY_POST_TYPE_ID,
                         apply_filters( 'bbp_register_topic_reply_post_type',
                                 array (
-                                        'labels'            => $topic_reply_labels,
-                                        'rewrite'           => $topic_reply_rewrite,
-                                        'supports'          => $topic_reply_supports,
+                                        'labels'            => $reply_labels,
+                                        'rewrite'           => $reply_rewrite,
+                                        'supports'          => $reply_supports,
                                         'menu_position'     => '100',
                                         'public'            => true,
@@ -376 +376 @@
                                         'can_export'        => true,
                                         'capability_type'   => 'post',
-                                        'hierarchical'      => false,
+                                        'hierarchical'      => true,
                                         'query_var'         => true,
                                         'menu_icon'         => ''

branches/plugin/bbp-templatetags.php

@@ -351 +351 @@
                         $forum_id = bbp_get_forum_id();
 
-                $forum_topic_replies = get_pages( array( 'post_parent' => $forum_id, 'post_type' => BBP_TOPIC_REPLY_POST_TYPE_ID ) );
+                $forum_topic_replies = get_pages( array( 'post_parent' => $forum_id, 'post_type' => BBP_REPLY_POST_TYPE_ID ) );
 
                 return apply_filters( 'bbp_get_forum_topic_reply_count', count( $forum_topic_replies, COUNT_RECURSIVE ) );
@@ -750 +750 @@
                         $topic_id = bbp_get_topic_id();
 
-                $topic_replies = get_pages( array( 'post_parent' => $topic_id, 'post_type' => BBP_TOPIC_REPLY_POST_TYPE_ID ) );
+                $topic_replies = get_pages( array( 'post_parent' => $topic_id, 'post_type' => BBP_REPLY_POST_TYPE_ID ) );
 
                 return apply_filters( 'bbp_get_topic_reply_count', count( $topic_replies, COUNT_RECURSIVE ) );
@@ -880 +880 @@
         $default = array(
                 // Narrow query down to bbPress topics
-                'post_type'        => BBP_TOPIC_REPLY_POST_TYPE_ID,
+                'post_type'        => BBP_REPLY_POST_TYPE_ID,
 
                 // Forum ID
@@ -1249 +1249 @@
         global $wp_query;
 
-        if ( BBP_TOPIC_REPLY_POST_TYPE_ID === $wp_query->query_vars['post_type'] )
+        if ( BBP_REPLY_POST_TYPE_ID === $wp_query->query_vars['post_type'] )
                 return true;