Changeset 2597

Timestamp:

11/15/2010 04:29:30 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Revert to colloquial barbarisms (content type/post type)

Location:

branches/plugin

Files:

• bbp-includes/bbp-loader.php (modified) (2 diffs)
• bbpress.php (modified) (7 diffs)

branches/plugin/bbp-includes/bbp-loader.php

@@ -31 +31 @@
 
                 // Attach to bbp_init.
-                add_action( 'bbp_init',       array ( $this, 'register_content_types'   ), 6  );
+                add_action( 'bbp_init',       array ( $this, 'register_post_types'      ), 6  );
                 add_action( 'bbp_init',       array ( $this, 'register_taxonomies'      ), 8  );
                 add_action( 'bbp_init',       array ( $this, 'register_textdomain',     ), 10 );
@@ -115 +115 @@
 
         /**
-         * register_content_types ()
+         * register_post_types ()
          *
-         * Setup the content types
+         * Setup the post types
          *
          * @since bbPress (r2464)
          */
-        function register_content_types () {
-                do_action ( 'bbp_register_content_types' );
+        function register_post_types () {
+                do_action ( 'bbp_register_post_types' );
         }
 

branches/plugin/bbpress.php

@@ -66 +66 @@
 
                 // Register content types
-                add_action( 'bbp_register_content_types',   array ( $this, 'register_content_types'   ), 10, 2 );
+                add_action( 'bbp_register_post_types',      array ( $this, 'register_post_types'   ), 10, 2 );
 
                 // Register taxonomies
@@ -90 +90 @@
 
                 // Unique identifiers
-                $this->forum_id       = apply_filters( 'bbp_forum_content_type', 'bbp_forum' );
-                $this->topic_id       = apply_filters( 'bbp_topic_content_type', 'bbp_topic' );
-                $this->reply_id       = apply_filters( 'bbp_reply_content_type', 'bbp_reply' );
+                $this->forum_id       = apply_filters( 'bbp_forum_post_type', 'bbp_forum' );
+                $this->topic_id       = apply_filters( 'bbp_topic_post_type', 'bbp_topic' );
+                $this->reply_id       = apply_filters( 'bbp_reply_post_type', 'bbp_reply' );
                 $this->topic_tag_id   = apply_filters( 'bbp_topic_tag_id',       'bbp_topic_tag' );
 
@@ -176 +176 @@
 
         /**
-         * register_content_types ()
-         *
-         * Setup the post types and taxonomy for forums
-         *
-         * @todo Finish up the post type admin area with messages, columns, etc...*
-         */
-        function register_content_types () {
+         * register_post_types ()
+         *
+         * Setup the content types and taxonomies for forums
+         *
+         * @todo messages
+         */
+        function register_post_types () {
 
                 // Forum labels
@@ -219 +219 @@
                 register_post_type (
                         $this->forum_id,
-                        apply_filters( 'bbp_register_forum_content_type',
+                        apply_filters( 'bbp_register_forum_post_type',
                                 array (
                                         'labels'          => $forum_labels,
@@ -271 +271 @@
                 register_post_type (
                         $this->topic_id,
-                        apply_filters( 'bbp_register_topic_content_type',
+                        apply_filters( 'bbp_register_topic_post_type',
                                 array (
                                         'labels'          => $topic_labels,
@@ -323 +323 @@
                 register_post_type (
                         $this->reply_id,
-                        apply_filters( 'bbp_register_reply_content_type',
+                        apply_filters( 'bbp_register_reply_post_type',
                                 array (
                                         'labels'          => $reply_labels,
@@ -377 +377 @@
                         $this->topic_tag_id, // The topic tag ID
                         $this->topic_id,     // The topic content type
-                        apply_filters( 'bbp_register_topic_tag',
+                        apply_filters( 'bbp_register_topic_taxonomy',
                                 array (
                                         'labels'                => $topic_tag_labels,