IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trim tailing whitespace

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@11450 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
2009-05-24 23:47:49 +00:00
parent d514a0d6b2
commit 2df887bd07
54 changed files with 218 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wp-includes/taxonomy.php
View File

@@ -15,9 +15,9 @@
* Creates the initial taxonomies when 'init' action is fired.
*/
function create_initial_taxonomies() {
register_taxonomy( 'category', 'post', array('hierarchical' => true, 'update_count_callback' => '_update_post_term_count', 'label' => __('Categories'), 'query_var' => false, 'rewrite' => false) ) ;
register_taxonomy( 'post_tag', 'post', array('hierarchical' => false, 'update_count_callback' => '_update_post_term_count', 'label' => __('Post Tags'), 'query_var' => false, 'rewrite' => false) ) ;
register_taxonomy( 'link_category', 'link', array('hierarchical' => false, 'label' => __('Categories'), 'query_var' => false, 'rewrite' => false) ) ;
register_taxonomy( 'category', 'post', array('hierarchical' => true, 'update_count_callback' => '_update_post_term_count', 'label' => __('Categories'), 'query_var' => false, 'rewrite' => false) ) ;
register_taxonomy( 'post_tag', 'post', array('hierarchical' => false, 'update_count_callback' => '_update_post_term_count', 'label' => __('Post Tags'), 'query_var' => false, 'rewrite' => false) ) ;
register_taxonomy( 'link_category', 'link', array('hierarchical' => false, 'label' => __('Categories'), 'query_var' => false, 'rewrite' => false) ) ;
}
add_action( 'init', 'create_initial_taxonomies', 0 ); // highest priority
@@ -167,7 +167,7 @@ function is_taxonomy_hierarchical($taxonomy) {
function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
global $wp_taxonomies, $wp_rewrite, $wp;
if (!is_array($wp_taxonomies))
if (!is_array($wp_taxonomies))
$wp_taxonomies = array();
$defaults = array('hierarchical' => false, 'update_count_callback' => '', 'rewrite' => true, 'query_var' => true);
@@ -525,7 +525,7 @@ function get_term_to_edit( $id, $taxonomy ) {
* The 'list_terms_exclusions' filter passes the compiled exclusions along with
* the $args.
*
* The 'get_terms_orderby' filter passes the ORDER BY clause for the query
* The 'get_terms_orderby' filter passes the ORDER BY clause for the query
* along with the $args array.
* The 'get_terms_fields' filter passes the fields for the SELECT query
@@ -533,10 +533,10 @@ function get_term_to_edit( $id, $taxonomy ) {
*
* The list of arguments that $args can contain, which will overwrite the defaults:
*
* orderby - Default is 'name'. Can be name, count, term_group, slug or nothing
* orderby - Default is 'name'. Can be name, count, term_group, slug or nothing
* (will use term_id), Passing a custom value other than these will cause it to
* order based on the custom value.
*
*
* order - Default is ASC. Can use DESC.
*
* hide_empty - Default is true. Will not return empty terms, which means
@@ -680,7 +680,7 @@ function &get_terms($taxonomies, $args = '') {
$orderby = 't.slug';
else if ( 'term_group' == $_orderby )
$orderby = 't.term_group';
elseif ( empty($_orderby) || 'id' == $_orderby )
elseif ( empty($_orderby) || 'id' == $_orderby )
$orderby = 't.term_id';
$orderby = apply_filters( 'get_terms_orderby', $orderby, $args );
@@ -871,7 +871,7 @@ function is_term($term, $taxonomy = '', $parent = 0) {
}
$term = trim( stripslashes( $term ) );
if ( '' === $slug = sanitize_title($term) )
return 0;