Index: trunk/src/wp-admin/includes/template.php
===================================================================
--- trunk/src/wp-admin/includes/template.php (revision 25031)
+++ trunk/src/wp-admin/includes/template.php (revision )
@@ -8,196 +8,6 @@
* @subpackage Administration
*/
-//
-// Category Checklists
-//
-
-/**
- * Walker to output an unordered list of category checkbox elements.
- *
- * @see Walker
- * @see wp_category_checklist()
- * @see wp_terms_checklist()
- * @since 2.5.1
- */
-class Walker_Category_Checklist extends Walker {
- var $tree_type = 'category';
- var $db_fields = array ('parent' => 'parent', 'id' => 'term_id'); //TODO: decouple this
-
- function start_lvl( &$output, $depth = 0, $args = array() ) {
- $indent = str_repeat("\t", $depth);
- $output .= "$indent\n";
- }
-
- function end_lvl( &$output, $depth = 0, $args = array() ) {
- $indent = str_repeat("\t", $depth);
- $output .= "$indent
\n";
- }
-
- function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
- extract($args);
- if ( empty($taxonomy) )
- $taxonomy = 'category';
-
- if ( $taxonomy == 'category' )
- $name = 'post_category';
- else
- $name = 'tax_input['.$taxonomy.']';
-
- $class = in_array( $category->term_id, $popular_cats ) ? ' class="popular-category"' : '';
- $output .= "\n" . '';
- }
-
- function end_el( &$output, $category, $depth = 0, $args = array() ) {
- $output .= "\n";
- }
-}
-
-/**
- * Output an unordered list of checkbox elements labelled
- * with category names.
- *
- * @see wp_terms_checklist()
- * @since 2.5.1
- *
- * @param int $post_id Mark categories associated with this post as checked. $selected_cats must not be an array.
- * @param int $descendants_and_self ID of the category to output along with its descendents.
- * @param bool|array $selected_cats List of categories to mark as checked.
- * @param bool|array $popular_cats Override the list of categories that receive the "popular-category" class.
- * @param object $walker Walker object to use to build the output.
- * @param bool $checked_ontop Move checked items out of the hierarchy and to the top of the list.
- */
-function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $selected_cats = false, $popular_cats = false, $walker = null, $checked_ontop = true ) {
- wp_terms_checklist( $post_id, array(
- 'taxonomy' => 'category',
- 'descendants_and_self' => $descendants_and_self,
- 'selected_cats' => $selected_cats,
- 'popular_cats' => $popular_cats,
- 'walker' => $walker,
- 'checked_ontop' => $checked_ontop
- ) );
-}
-
-/**
- * Output an unordered list of checkbox elements labelled
- * with term names. Taxonomy independent version of wp_category_checklist().
- *
- * @since 3.0.0
- *
- * @param int $post_id
- * @param array $args
- */
-function wp_terms_checklist($post_id = 0, $args = array()) {
- $defaults = array(
- 'descendants_and_self' => 0,
- 'selected_cats' => false,
- 'popular_cats' => false,
- 'walker' => null,
- 'taxonomy' => 'category',
- 'checked_ontop' => true
- );
- $args = apply_filters( 'wp_terms_checklist_args', $args, $post_id );
-
- extract( wp_parse_args($args, $defaults), EXTR_SKIP );
-
- if ( empty($walker) || !is_a($walker, 'Walker') )
- $walker = new Walker_Category_Checklist;
-
- $descendants_and_self = (int) $descendants_and_self;
-
- $args = array('taxonomy' => $taxonomy);
-
- $tax = get_taxonomy($taxonomy);
- $args['disabled'] = !current_user_can($tax->cap->assign_terms);
-
- if ( is_array( $selected_cats ) )
- $args['selected_cats'] = $selected_cats;
- elseif ( $post_id )
- $args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
- else
- $args['selected_cats'] = array();
-
- if ( is_array( $popular_cats ) )
- $args['popular_cats'] = $popular_cats;
- else
- $args['popular_cats'] = get_terms( $taxonomy, array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
-
- if ( $descendants_and_self ) {
- $categories = (array) get_terms($taxonomy, array( 'child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0 ) );
- $self = get_term( $descendants_and_self, $taxonomy );
- array_unshift( $categories, $self );
- } else {
- $categories = (array) get_terms($taxonomy, array('get' => 'all'));
- }
-
- if ( $checked_ontop ) {
- // Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache)
- $checked_categories = array();
- $keys = array_keys( $categories );
-
- foreach( $keys as $k ) {
- if ( in_array( $categories[$k]->term_id, $args['selected_cats'] ) ) {
- $checked_categories[] = $categories[$k];
- unset( $categories[$k] );
- }
- }
-
- // Put checked cats on top
- echo call_user_func_array(array(&$walker, 'walk'), array($checked_categories, 0, $args));
- }
- // Then the rest of them
- echo call_user_func_array(array(&$walker, 'walk'), array($categories, 0, $args));
-}
-
-/**
- * Retrieve a list of the most popular terms from the specified taxonomy.
- *
- * If the $echo argument is true then the elements for a list of checkbox
- * elements labelled with the names of the selected terms is output.
- * If the $post_ID global isn't empty then the terms associated with that
- * post will be marked as checked.
- *
- * @since 2.5.0
- *
- * @param string $taxonomy Taxonomy to retrieve terms from.
- * @param int $default Unused.
- * @param int $number Number of terms to retrieve. Defaults to 10.
- * @param bool $echo Optionally output the list as well. Defaults to true.
- * @return array List of popular term IDs.
- */
-function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $echo = true ) {
- $post = get_post();
-
- if ( $post && $post->ID )
- $checked_terms = wp_get_object_terms($post->ID, $taxonomy, array('fields'=>'ids'));
- else
- $checked_terms = array();
-
- $terms = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false ) );
-
- $tax = get_taxonomy($taxonomy);
-
- $popular_ids = array();
- foreach ( (array) $terms as $term ) {
- $popular_ids[] = $term->term_id;
- if ( !$echo ) // hack for AJAX use
- continue;
- $id = "popular-$taxonomy-$term->term_id";
- $checked = in_array( $term->term_id, $checked_terms ) ? 'checked="checked"' : '';
- ?>
-
-
-
-
-
- elements.
+ *
+ * @see Walker
+ * @see wp_category_checklist()
+ * @see wp_terms_checklist()
+ * @since 2.5.1
+ */
+class Walker_Category_Checklist extends Walker {
+ var $tree_type = 'category';
+ var $db_fields = array ('parent' => 'parent', 'id' => 'term_id'); //TODO: decouple this
+
+ function start_lvl( &$output, $depth = 0, $args = array() ) {
+ $indent = str_repeat("\t", $depth);
+ $output .= "$indent\n";
+ }
+
+ function end_lvl( &$output, $depth = 0, $args = array() ) {
+ $indent = str_repeat("\t", $depth);
+ $output .= "$indent
\n";
+ }
+
+ function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
+ extract($args);
+
+ if ( empty($taxonomy) )
+ $taxonomy = 'category';
+
+ if ( !isset($name) || !$name ) {
+ if ( $taxonomy == 'category' )
+ $name = 'post_category';
+ else
+ $name = 'tax_input['.$taxonomy.']';
+ }
+
+ $class = in_array( $category->term_id, $popular_cats ) ? ' class="popular-category"' : '';
+ $output .= "\n" . '';
+ }
+
+ function end_el( &$output, $category, $depth = 0, $args = array() ) {
+ $output .= "\n";
+ }
+}
+
+/**
+ * Output an unordered list of checkbox elements labelled
+ * with category names.
+ *
+ * @see wp_terms_checklist()
+ * @since 2.5.1
+ *
+ * @param int $post_id Mark categories associated with this post as checked. $selected_cats must not be an array.
+ * @param int $descendants_and_self ID of the category to output along with its descendents.
+ * @param bool|array $selected_cats List of categories to mark as checked.
+ * @param bool|array $popular_cats Override the list of categories that receive the "popular-category" class.
+ * @param object $walker Walker object to use to build the output.
+ * @param bool $checked_ontop Move checked items out of the hierarchy and to the top of the list.
+ */
+function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $selected_cats = false, $popular_cats = false, $walker = null, $checked_ontop = true ) {
+ wp_terms_checklist( $post_id, array(
+ 'taxonomy' => 'category',
+ 'descendants_and_self' => $descendants_and_self,
+ 'selected_cats' => $selected_cats,
+ 'popular_cats' => $popular_cats,
+ 'walker' => $walker,
+ 'checked_ontop' => $checked_ontop
+ ) );
+}
+
+/**
+ * Output an unordered list of checkbox elements labelled
+ * with term names. Taxonomy independent version of wp_category_checklist().
+ *
+ * @since 3.0.0
+ *
+ * @param int $post_id
+ * @param array $args
+ */
+function wp_terms_checklist($post_id = 0, $args = array()) {
+ $defaults = array(
+ 'descendants_and_self' => 0,
+ 'selected_cats' => false,
+ 'popular_cats' => false,
+ 'walker' => null,
+ 'taxonomy' => 'category',
+ 'checked_ontop' => true
+ );
+ $args = apply_filters( 'wp_terms_checklist_args', $args, $post_id );
+
+ extract( wp_parse_args($args, $defaults), EXTR_SKIP );
+
+ if ( empty($walker) || !is_a($walker, 'Walker') )
+ $walker = new Walker_Category_Checklist;
+
+ $descendants_and_self = (int) $descendants_and_self;
+
+ $args = array('taxonomy' => $taxonomy);
+
+ if ( isset($name) )
+ $args['name'] = $name;
+
+ if ( is_array( $selected_cats ) )
+ $args['selected_cats'] = $selected_cats;
+ elseif ( $post_id )
+ $args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
+ else
+ $args['selected_cats'] = array();
+
+ if ( is_array( $popular_cats ) )
+ $args['popular_cats'] = $popular_cats;
+ else
+ $args['popular_cats'] = get_terms( $taxonomy, array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
+
+ if ( $descendants_and_self ) {
+ $categories = (array) get_terms($taxonomy, array( 'child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0 ) );
+ $self = get_term( $descendants_and_self, $taxonomy );
+ array_unshift( $categories, $self );
+ } else {
+ $categories = (array) get_terms($taxonomy, array('get' => 'all'));
+ }
+
+ if ( $checked_ontop ) {
+ // Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache)
+ $checked_categories = array();
+ $keys = array_keys( $categories );
+
+ foreach( $keys as $k ) {
+ if ( in_array( $categories[$k]->term_id, $args['selected_cats'] ) ) {
+ $checked_categories[] = $categories[$k];
+ unset( $categories[$k] );
+ }
+ }
+
+ // Put checked cats on top
+ echo call_user_func_array(array(&$walker, 'walk'), array($checked_categories, 0, $args));
+ }
+ // Then the rest of them
+ echo call_user_func_array(array(&$walker, 'walk'), array($categories, 0, $args));
+}
+
+/**
+ * Retrieve a list of the most popular terms from the specified taxonomy.
+ *
+ * If the $echo argument is true then the elements for a list of checkbox
+ * elements labelled with the names of the selected terms is output.
+ * If the $post_ID global isn't empty then the terms associated with that
+ * post will be marked as checked.
+ *
+ * @since 2.5.0
+ *
+ * @param string $taxonomy Taxonomy to retrieve terms from.
+ * @param int $default Unused.
+ * @param int $number Number of terms to retrieve. Defaults to 10.
+ * @param bool $echo Optionally output the list as well. Defaults to true.
+ * @return array List of popular term IDs.
+ */
+function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $echo = true ) {
+ $post = get_post();
+
+ if ( $post && $post->ID )
+ $checked_terms = wp_get_object_terms($post->ID, $taxonomy, array('fields'=>'ids'));
+ else
+ $checked_terms = array();
+
+ $terms = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false ) );
+
+ $popular_ids = array();
+ foreach ( (array) $terms as $term ) {
+ $popular_ids[] = $term->term_id;
+ if ( !$echo ) // hack for AJAX use
+ continue;
+ $id = "popular-$taxonomy-$term->term_id";
+ $checked = in_array( $term->term_id, $checked_terms ) ? 'checked="checked"' : '';
+ ?>
+
+
+
+
+
+