WordPress 3.8-scripts

[autoinstalls/wordpress.git] / wp-includes / category-template.php

diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index 96a61cf35ecf1b90b9d93d5304dc9986457d019d..6ffd9d35ef62fe0e7bac7bc499245fdaebad8a04 100644 (file)
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -41,7 +41,7 @@ function get_category_link( $category ) {
  */
 function get_category_parents( $id, $link = false, $separator = '/', $nicename = false, $visited = array() ) {
        $chain = '';
-       $parent = get_category( $id );
+       $parent = get_term( $id, 'category' );
        if ( is_wp_error( $parent ) )
                return $parent;
 
@@ -135,7 +135,7 @@ function _usort_terms_by_ID( $a, $b ) {
  */
 function get_the_category_by_ID( $cat_ID ) {
        $cat_ID = (int) $cat_ID;
-       $category = get_category( $cat_ID );
+       $category = get_term( $cat_ID, 'category' );
        if ( is_wp_error( $category ) )
                return $category;
        return $category->name;
@@ -225,6 +225,7 @@ function get_the_category_list( $separator = '', $parents='', $post_id = false )
  * As of 2.7, the function can be used anywhere if it is provided a post ID or post object.
  *
  * @since 1.2.0
+ * @uses has_category()
  *
  * @param int|string|array $category Category ID, name or slug, or array of said.
  * @param int|object $post Optional. Post to check instead of the current post. (since 2.7.0)
@@ -234,7 +235,7 @@ function in_category( $category, $post = null ) {
        if ( empty( $category ) )
                return false;
 
-       return has_term( $category, 'category', $post );
+       return has_category( $category, $post );
 }
 
 /**
@@ -451,7 +452,7 @@ function wp_list_categories( $args = '' ) {
        if ( empty( $categories ) ) {
                if ( ! empty( $show_option_none ) ) {
                        if ( 'list' == $style )
-                               $output .= '<li>' . $show_option_none . '</li>';
+                               $output .= '<li class="cat-item-none">' . $show_option_none . '</li>';
                        else
                                $output .= $show_option_none;
                }
@@ -460,14 +461,14 @@ function wp_list_categories( $args = '' ) {
                        $posts_page = ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) ) ? get_permalink( get_option( 'page_for_posts' ) ) : home_url( '/' );
                        $posts_page = esc_url( $posts_page );
                        if ( 'list' == $style )
-                               $output .= "<li><a href='$posts_page'>$show_option_all</a></li>";
+                               $output .= "<li class='cat-item-all'><a href='$posts_page'>$show_option_all</a></li>";
                        else
                                $output .= "<a href='$posts_page'>$show_option_all</a>";
                }
 
                if ( empty( $r['current_category'] ) && ( is_category() || is_tax() || is_tag() ) ) {
                        $current_term_object = get_queried_object();
-                       if ( $r['taxonomy'] == $current_term_object->taxonomy )
+                       if ( $current_term_object && $r['taxonomy'] === $current_term_object->taxonomy )
                                $r['current_category'] = get_queried_object_id();
                }
 
@@ -765,6 +766,8 @@ function walk_category_dropdown_tree() {
  */
 class Walker_Category extends Walker {
        /**
+        * What the class handles.
+        *
         * @see Walker::$tree_type
         * @since 2.1.0
         * @var string
@@ -772,6 +775,8 @@ class Walker_Category extends Walker {
        var $tree_type = 'category';
 
        /**
+        * Database fields to use.
+        *
         * @see Walker::$db_fields
         * @since 2.1.0
         * @todo Decouple this
@@ -780,12 +785,16 @@ class Walker_Category extends Walker {
        var $db_fields = array ('parent' => 'parent', 'id' => 'term_id');
 
        /**
+        * Starts the list before the elements are added.
+        *
         * @see Walker::start_lvl()
+        *
         * @since 2.1.0
         *
         * @param string $output Passed by reference. Used to append additional content.
-        * @param int $depth Depth of category. Used for tab indentation.
-        * @param array $args Will only append content if style argument value is 'list'.
+        * @param int    $depth  Depth of category. Used for tab indentation.
+        * @param array  $args   An array of arguments. Will only append content if style argument value is 'list'.
+        *                       @see wp_list_categories()
         */
        function start_lvl( &$output, $depth = 0, $args = array() ) {
                if ( 'list' != $args['style'] )
@@ -796,12 +805,16 @@ class Walker_Category extends Walker {
        }
 
        /**
+        * Ends the list of after the elements are added.
+        *
         * @see Walker::end_lvl()
+        *
         * @since 2.1.0
         *
         * @param string $output Passed by reference. Used to append additional content.
-        * @param int $depth Depth of category. Used for tab indentation.
-        * @param array $args Will only append content if style argument value is 'list'.
+        * @param int    $depth  Depth of category. Used for tab indentation.
+        * @param array  $args   An array of arguments. Will only append content if style argument value is 'list'.
+        *                       @wsee wp_list_categories()
         */
        function end_lvl( &$output, $depth = 0, $args = array() ) {
                if ( 'list' != $args['style'] )
@@ -812,13 +825,17 @@ class Walker_Category extends Walker {
        }
 
        /**
+        * Start the element output.
+        *
         * @see Walker::start_el()
+        *
         * @since 2.1.0
         *
-        * @param string $output Passed by reference. Used to append additional content.
+        * @param string $output   Passed by reference. Used to append additional content.
         * @param object $category Category data object.
-        * @param int $depth Depth of category in reference to parents.
-        * @param array $args
+        * @param int    $depth    Depth of category in reference to parents. Default 0.
+        * @param array  $args     An array of arguments. @see wp_list_categories()
+        * @param int    $id       ID of the current category.
         */
        function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
                extract($args);
@@ -884,13 +901,16 @@ class Walker_Category extends Walker {
        }
 
        /**
+        * Ends the element output, if needed.
+        *
         * @see Walker::end_el()
+        *
         * @since 2.1.0
         *
         * @param string $output Passed by reference. Used to append additional content.
-        * @param object $page Not used.
-        * @param int $depth Depth of category. Not used.
-        * @param array $args Only uses 'list' for whether should append to output.
+        * @param object $page   Not used.
+        * @param int    $depth  Depth of category. Not used.
+        * @param array  $args   An array of arguments. Only uses 'list' for whether should append to output. @see wp_list_categories()
         */
        function end_el( &$output, $page, $depth = 0, $args = array() ) {
                if ( 'list' != $args['style'] )
@@ -925,13 +945,15 @@ class Walker_CategoryDropdown extends Walker {
        var $db_fields = array ('parent' => 'parent', 'id' => 'term_id');
 
        /**
+        * Start the element output.
+        *
         * @see Walker::start_el()
         * @since 2.1.0
         *
-        * @param string $output Passed by reference. Used to append additional content.
+        * @param string $output   Passed by reference. Used to append additional content.
         * @param object $category Category data object.
-        * @param int $depth Depth of category. Used for padding.
-        * @param array $args Uses 'selected' and 'show_count' keys, if they exist.
+        * @param int    $depth    Depth of category. Used for padding.
+        * @param array  $args     Uses 'selected' and 'show_count' keys, if they exist. @see wp_dropdown_categories()
         */
        function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
                $pad = str_repeat('&nbsp;', $depth * 3);
@@ -1039,10 +1061,12 @@ function tag_description( $tag = 0 ) {
  * @return string Term description, available.
  */
 function term_description( $term = 0, $taxonomy = 'post_tag' ) {
-       if ( !$term && ( is_tax() || is_tag() || is_category() ) ) {
+       if ( ! $term && ( is_tax() || is_tag() || is_category() ) ) {
                $term = get_queried_object();
-               $taxonomy = $term->taxonomy;
-               $term = $term->term_id;
+               if ( $term ) {
+                       $taxonomy = $term->taxonomy;
+                       $term = $term->term_id;
+               }
        }
        $description = get_term_field( 'description', $term, $taxonomy );
        return is_wp_error( $description ) ? '' : $description;