WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow taxonomy registration before init. Props arena. fixes #9647 

git-svn-id: http://svn.automattic.com/wordpress/trunk@11122 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-04-29 16:40:36 +00:00
parent a240e226fb
commit 5a1c8da169
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wp-includes/taxonomy.php
View File

@ -12,20 +12,14 @@
// //
/** /**
* Default Taxonomy Objects * Creates the initial taxonomies when 'init' action is fired.
* @since 2.3.0
* @global array $wp_taxonomies
*/ */
$wp_taxonomies = array();
function create_initial_taxonomies() { function create_initial_taxonomies() {
global $wp_taxonomies; register_taxonomy( 'category', 'post', array('hierarchical' => true, 'update_count_callback' => '_update_post_term_count', 'label' => __('Categories')) ) ;
$wp_taxonomies['category'] = (object) array('name' => 'category', 'object_type' => 'post', 'hierarchical' => true, 'update_count_callback' => '_update_post_term_count', 'label' => __('Categories')); register_taxonomy( 'post_tag', 'post', array('hierarchical' => false, 'update_count_callback' => '_update_post_term_count', 'label' => __('Post Tags')) ) ;
$wp_taxonomies['post_tag'] = (object) array('name' => 'post_tag', 'object_type' => 'post', 'hierarchical' => false, 'update_count_callback' => '_update_post_term_count', 'label' => __('Post Tags')); register_taxonomy( 'link_category', 'link', array('hierarchical' => false) ) ;
$wp_taxonomies['link_category'] = (object) array('name' => 'link_category', 'object_type' => 'link', 'hierarchical' => false);
} }
add_action( 'init', 'create_initial_taxonomies' ); add_action( 'init', 'create_initial_taxonomies', 0 ); // highest priority
/** /**
* Return all of the taxonomy names that are of $object_type. * Return all of the taxonomy names that are of $object_type.
@ -173,6 +167,12 @@ function is_taxonomy_hierarchical($taxonomy) {
function register_taxonomy( $taxonomy, $object_type, $args = array() ) { function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
global $wp_taxonomies, $wp_rewrite, $wp; global $wp_taxonomies, $wp_rewrite, $wp;
if (!is_array($wp_taxonomies))
$wp_taxonomies = array();
if (isset($wp_taxonomies[$taxonomy]))
return;
$defaults = array('hierarchical' => false, 'update_count_callback' => '', 'rewrite' => true, 'query_var' => true); $defaults = array('hierarchical' => false, 'update_count_callback' => '', 'rewrite' => true, 'query_var' => true);
$args = wp_parse_args($args, $defaults); $args = wp_parse_args($args, $defaults);