View difference between Paste ID: Ap5E7fyV and hQa6110R

 <?php
 /*
-Plugin Name: Custom Post Type Test
+Plugin Name: Custom Post Type and taxonomy Test
 Plugin URI: http://zed1.com/
-Description: Testing Custom Post Types in WordPres 3.3
+Description: Testing Custom Post Types in WordPres 3.4
 Author: Mike Little
 Version: 0.1.0
 Author URI: http://zed1.com/
 License: GPLv2 or later
 */
 
-new cpt(); // kick it all off
+if ( !defined( 'NL' ) ) define( 'NL' , "\n" );
 
-class cpt {
+define( 'Z1_CPT_POST_TYPE',			'cpt' );
 define( 'Z1_CPT_POST_TYPE_SLUG',	'cpts' );
-		register_activation_hook( __FILE__, array( 'cpt', 'activation' ) );
+
-		register_deactivation_hook( __FILE__, array( 'cpt', 'deactivation' ) );
+new z1_cpt(); // kick it all off
-        add_action( 'init', array( 'cpt', 'init' ) );
+
-        add_filter( 'the_content', array( 'cpt', 'extra_content' ) );
+register_activation_hook( __FILE__,   array( 'z1_cpt', 'activation' ) );
 register_deactivation_hook( __FILE__, array( 'z1_cpt', 'deactivation' ) );
 
 class z1_cpt {
 	function __construct() {
         add_action( 'init',			array( 'z1_cpt', 'init' ) );
         add_filter( 'the_content',	array( 'z1_cpt', 'extra_content' ) );
 		add_action('parse_query',	array( 'z1_cpt', 'parse_query' ) );
 
 		// remove add new from admin bar
 		add_action( 'admin_bar_menu', array( 'z1_cpt', 'admin_bar_menu_remove_add_new' ), 75 );
 
 		if ( !is_admin() )
 			return;
 
 		// remove add new the menu
 		add_action( 'admin_menu', array( 'z1_cpt', 'admin_menu_hide_add_new' ) );
 		// remove the add-new link at the top of the list and edit/new pages
 		add_action('admin_head', array( 'z1_cpt', 'admin_head_hide_add_new_link' ) );
 
 		// help
 		add_action( 'load-post.php',	 array( 'z1_cpt', 'add_help_tabs' ) );
 		add_action( 'load-post-new.php', array( 'z1_cpt', 'add_help_tabs' ) );
-		if ( !post_type_exists( 'cpt' ) ) {
+
-			$labels = array( 'name' => _x( 'CPTs', 'post type general name' ),
+
-							 'singular_name' => _x( 'CPT', 'post type singular name' ),
+
-							 'add_new' => _x( 'New CPT', 'add new singular name' ),
+
-							 'add_new_item' => __( 'Add New CPT' ),
+
-							 'edit_item' => __( 'Edit CPT' ),
+
-							 'new_item' => __( 'New CPT' ),
+
-							 'view_item' => __( 'View CPT' ),
+
-							 'search_items' => __( 'Search CPTs' ),
+
-							 'not_found' =>  __( 'No CPTs Found' ),
+
-							 'not_found_in_trash' => __( 'No CPTs found in Trash' ),
+
 
     static function flush_rules() {
 		flush_rewrite_rules();
 	} // end deactivation
 
     static function init() {
 		self::register_cpt();
 		self::register_taxes();
-						   'has_archive' => 'cpts',
+
 
 	static function register_cpt() {
 		if ( !post_type_exists( Z1_CPT_POST_TYPE ) ) {
 			$labels = array( 'name' => _x( 'CPTs', 'post type general name', 'z1_cpt' ),
 							 'singular_name' => _x( 'CPT', 'post type singular name', 'z1_cpt' ),
 							 'add_new' => _x( 'New CPT', 'add new singular name', 'z1_cpt' ),
-												'excerpt',
+							 'add_new_item' => __( 'Add New CPT', 'z1_cpt' ),
 							 'edit_item' => __( 'Edit CPT', 'z1_cpt' ),
 							 'new_item' => __( 'New CPT', 'z1_cpt' ),
 							 'view_item' => __( 'View CPT', 'z1_cpt' ),
 							 'search_items' => __( 'Search CPTs', 'z1_cpt' ),
 							 'not_found' =>  __( 'No CPTs Found', 'z1_cpt' ),
-			register_post_type( 'cpt', $args );
+							 'not_found_in_trash' => __( 'No CPTs found in Trash', 'z1_cpt' ),
 							 'parent_item_colon' => '-:-'
 						   );
 			$args = array( 'labels' => $labels,
 						   'public' => true,
 						   'publicly_queryable' => true,
 						   'show_ui' => true,
 						   'query_var' => true,
-								'name' => _x( 'Taxonomy ones', 'taxonomy general name' ), // there will only be one
+
-								'singular_name' => _x( 'Taxonomy one', 'taxonomy singular name' ),
+						   'has_archive' => Z1_CPT_POST_TYPE_SLUG,
-								'search_items' =>  __( 'Search Taxonomy ones', 'dmd_school' ),
+
-								'popular_items' => __( 'Popular Taxonomy ones', 'dmd_school' ),
+
-								'all_items' => __( 'All Taxonomy ones', 'dmd_school' ),
+
 						   'menu_position' => 100, // last block
 						   'supports' => array( 'title',
-								'edit_item' => __( 'Edit Taxonomy one', 'dmd_school' ),
+
-								'update_item' => __( 'Update Taxonomy one', 'dmd_school' ),
+												'excerpt',
-								'add_new_item' => __( 'Add New Taxonomy one', 'dmd_school' ),
+
-								'new_item_name' => __( 'New Taxonomy one Name', 'dmd_school' ),
+
-								'separate_items_with_commas' => __( 'Separate Taxonomy ones with commas', 'dmd_school' ),
+
-								'add_or_remove_items' => __( 'Add or remove Taxonomy ones', 'dmd_school' ),
+
-								'choose_from_most_used' => __( 'Choose from the most used Taxonomy ones', 'dmd_school' )
+
 			register_post_type( Z1_CPT_POST_TYPE, $args );
 		}
-			register_taxonomy( 'tax1', 'cpt', array(
+
 
 	static function register_taxes() {
 
 		if ( !taxonomy_exists( 'tax1' ) ) {
 			$tax_labels = array(
 								'name' => _x( 'Taxonomy ones', 'taxonomy general name', 'z1_cpt' ), // there will only be one
-
+								'singular_name' => _x( 'Taxonomy one', 'taxonomy singular name', 'z1_cpt' ),
 								'search_items' =>  __( 'Search Taxonomy ones', 'z1_cpt' ),
 								'popular_items' => __( 'Popular Taxonomy ones', 'z1_cpt' ),
-				wp_insert_term( 'Tax One term one', 'tax1', array( 'slug' => 'tax1-term1', 'description' => 'Term number one for taxonomy one' ) );
+								'all_items' => __( 'All Taxonomy ones', 'z1_cpt' ),
 								'parent_item' => null,
 								'parent_item_colon' => null,
 								'edit_item' => __( 'Edit Taxonomy one', 'z1_cpt' ),
 								'update_item' => __( 'Update Taxonomy one', 'z1_cpt' ),
 								'add_new_item' => __( 'Add New Taxonomy one', 'z1_cpt' ),
-								'name' => _x( 'Taxonomy twos', 'taxonomy general name' ),
+								'new_item_name' => __( 'New Taxonomy one Name', 'z1_cpt' ),
-								'singular_name' => _x( 'Taxonomy two', 'taxonomy singular name' ),
+								'separate_items_with_commas' => __( 'Separate Taxonomy ones with commas', 'z1_cpt' ),
-								'search_items' =>  __( 'Search Taxonomy twos', 'dmd_school' ),
+								'add_or_remove_items' => __( 'Add or remove Taxonomy ones', 'z1_cpt' ),
-								'popular_items' => __( 'Popular Taxonomy twos', 'dmd_school' ),
+								'choose_from_most_used' => __( 'Choose from the most used Taxonomy ones', 'z1_cpt' )
-								'all_items' => __( 'All Taxonomy twos', 'dmd_school' ),
+
 
 			register_taxonomy( 'tax1', Z1_CPT_POST_TYPE, array(
-								'edit_item' => __( 'Edit Taxonomy two', 'dmd_school' ),
+
-								'update_item' => __( 'Update Taxonomy two', 'dmd_school' ),
+
-								'add_new_item' => __( 'Add New Taxonomy two', 'dmd_school' ),
+
-								'new_item_name' => __( 'New Taxonomy two Name', 'dmd_school' ),
+
-								'separate_items_with_commas' => __( 'Separate Taxonomy twos with commas', 'dmd_school' ),
+
-								'add_or_remove_items' => __( 'Add or remove Taxonomy twos', 'dmd_school' ),
+
-								'choose_from_most_used' => __( 'Choose from the most used Taxonomy twos', 'dmd_school' )
+
 			// add some predefined ones
 			if ( get_term_by( 'slug', 'tax1-term1', 'tax1' ) === false )
-			register_taxonomy( 'tax2', 'cpt', array(
+				wp_insert_term( __( 'Tax One term one', 'z1_cpt' ), 'tax1', array( 'slug' => 'tax1-term1', 'description' => __( 'Term number one for taxonomy one', 'z1_cpt' ) ) );
 		} // end if tax ! exists
 
 		if ( !taxonomy_exists( 'tax2' ) ) {
 			$tax_labels = array(
 								'name' => _x( 'Taxonomy twos', 'taxonomy general name', 'z1_cpt' ),
 								'singular_name' => _x( 'Taxonomy two', 'taxonomy singular name', 'z1_cpt' ),
-
+								'search_items' =>  __( 'Search Taxonomy twos', 'z1_cpt' ),
 								'popular_items' => __( 'Popular Taxonomy twos', 'z1_cpt' ),
 								'all_items' => __( 'All Taxonomy twos', 'z1_cpt' ),
-				wp_insert_term( 'Tax two term one', 'tax2', array( 'slug' => 'tax2-term1', 'description' => 'Term number one for tax two' ) );
+
 								'parent_item_colon' => null,
 								'edit_item' => __( 'Edit Taxonomy two', 'z1_cpt' ),
 								'update_item' => __( 'Update Taxonomy two', 'z1_cpt' ),
-				wp_insert_term( 'Tax two sub term two', 'tax2', array( 'slug' => 'tax2-sub-term2', 'parent' => $term->term_id, 'description' => 'Sub Term number two for tax two' ) );
+								'add_new_item' => __( 'Add New Taxonomy two', 'z1_cpt' ),
 								'new_item_name' => __( 'New Taxonomy two Name', 'z1_cpt' ),
 								'separate_items_with_commas' => __( 'Separate Taxonomy twos with commas', 'z1_cpt' ),
 								'add_or_remove_items' => __( 'Add or remove Taxonomy twos', 'z1_cpt' ),
 								'choose_from_most_used' => __( 'Choose from the most used Taxonomy twos', 'z1_cpt' )
 							   );
 
-		return $content
+			register_taxonomy( 'tax2', Z1_CPT_POST_TYPE, array(
-				. get_the_term_list( $post->ID, 'tax1', 'Tax One: ', ', ' , '' )
+
-				. get_the_term_list( $post->ID, 'tax2', 'Tax Two: ', ', ', '' );
+
 				'show_ui' => true,
-
+
-} // end class cpt
+
 				) );
-/* put this in your side bar
+
-<?php list_cpts(); ?>
+
 			if ( get_term_by( 'slug', 'tax2-term1', 'tax2' ) === false ) {
 				wp_insert_term( __( 'Tax two term one', 'z1_cpt' ), 'tax2', array( 'slug' => 'tax2-term1', 'description' => __( 'Term number one for tax two', 'z1_cpt' ) ) );
-function list_cpts( $args = array() ) {
+
 /*
-	$default_args = array( 'post_type'=>'cpt', 'title_li'=> __('CPTs') );
+			// stragely this doesn't always work
 			if ( get_term_by( 'slug', 'tax2-sub-term2', 'tax2' ) === false ) {
-	if ( is_single() && ( 'cpt' == $post->post_type ) ) {
+
 				wp_insert_term( __( 'Tax two sub term two', 'z1_cpt' ), 'tax2', array( 'slug' => 'tax2-sub-term2', 'parent' => $term->term_id, 'description' => __( 'Sub Term number two for tax two', 'z1_cpt' ) ) );
 			}
 //*/
 		} // end if tax ! exists
 
 	} // end register_taxes
 
 
 
-}
+	static function add_help_tabs() {
 		$screen = get_current_screen();
 		error_log(var_export($screen, true));
 		if ( Z1_CPT_POST_TYPE == $screen->id ) {
 			if ( 'add' == $screen->action ) {
 				$screen->add_help_tab( array(
 											 'id'      => 'additional-plugin-help', // This should be unique for the screen.
 											 'title'   => __( 'Special Instructions', 'z1_cpt' ),
 											 'content' => __( '<p>This is the help for adding a new CPT.</p>', 'z1_cpt' ),
 											 // Use 'callback' instead of 'content' for a function callback that renders the tab content.
 											) );
 			} else {
 				$screen->add_help_tab( array(
 											 'id'      => 'additional-plugin-help', // This should be unique for the screen.
 											 'title'   => __( 'Special Instructions', 'z1_cpt' ),
 											 'content' => __( '<p>This is the help for updating a CPT.</p>', 'z1_cpt' ),
 											 // Use 'callback' instead of 'content' for a function callback that renders the tab content.
 											) );
 			}
 		} // end if our cpt
 	} // end add_help_tabs
 
 
 	static function admin_menu_hide_add_new() {
 		global $submenu;
 		if ( is_admin() && isset( $submenu['edit.php?post_type=cpt'][10] ) ) {
 			unset( $submenu['edit.php?post_type=cpt'][10] );
 		}
 	} // admin_menu_hide_add_new
 
 	static function admin_head_hide_add_new_link() {
 		global $pagenow, $post_type;
 		if ( ( $pagenow == 'edit.php' ) || ( $pagenow == 'post.php' ) && isset( $post_type ) && ( Z1_CPT_POST_TYPE == $post_type ) ) {
 			echo NL . '<style type="text/css">' . NL
 					.  '.add-new-h2 { display: none; }' . NL
 					. '</style>' . NL;
 		}
 	} // end admin_head_hide_add_new_link
 
 	static function admin_bar_menu_remove_add_new( $wp_admin_bar) {
 		$wp_admin_bar->remove_node('new-cpt');
 	} // end admin_bar_menu_remove_add_new
 
 	static function parse_query( $query ) {
 	} // end parse_query
 
 
 	static function extra_content($content) {
 		global $post;
 		if ( is_singular( Z1_CPT_POST_TYPE ) )
 			return $content
 					. get_the_term_list( $post->ID, 'tax1', 'Tax One: ', ', ' , '' )
 					. get_the_term_list( $post->ID, 'tax2', 'Tax Two: ', ', ', '' );
 		return $content;
 	} //end extra_content
 
 } // end class z1_cpt
 
 
 /* Put this in your side bar
 <?php z1_list_cpts(); ?>
 */
 
 function z1_list_cpts( $args = array() ) {
 	global $post;
 	$default_args = array( 'post_type' => Z1_CPT_POST_TYPE, 'title_li'=> __('CPTs') );
 
 	if ( is_single() && ( Z1_CPT_POST_TYPE == $post->post_type ) ) {
 		if ( $parent_id = wp_get_post_parent_id( $post->ID ) ) {
 			$default_args['child_of'] = $parent_id; // get siblings
 		} else {
 			$default_args['child_of'] = $post->ID; // get children
 		}
 	}
 
 	$args = array_merge( $default_args, $args );
 	return wp_list_pages( $args );
 } // end z1_list_cpts