Wordpress 3.7

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

diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index 96a61cf35ecf1b90b9d93d5304dc9986457d019d..27b8bf221ff9f1ca58cd6eb9f4f5ac0e56fd1c13 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 = '';
  */
 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;
 
        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;
  */
 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;
        if ( is_wp_error( $category ) )
                return $category;
        return $category->name;


@@ -225,16 +225,14 @@ 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
  * 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)
  * @return bool True if the current post is in any of the given categories.
  */
 function in_category( $category, $post = null ) {
  *
  * @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)
  * @return bool True if the current post is in any of the given categories.
  */
 function in_category( $category, $post = null ) {

-       if ( empty( $category ) )
-               return false;
-
-       return has_term( $category, 'category', $post );
+       return has_category( $category, $post );

 }
 
 /**
 }
 
 /**


@@ -467,7 +465,7 @@ function wp_list_categories( $args = '' ) {
 
                if ( empty( $r['current_category'] ) && ( is_category() || is_tax() || is_tag() ) ) {
                        $current_term_object = get_queried_object();
 
                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();
                }
 
                                $r['current_category'] = get_queried_object_id();
                }
 


@@ -765,6 +763,8 @@ function walk_category_dropdown_tree() {
  */
 class Walker_Category extends Walker {
        /**
  */
 class Walker_Category extends Walker {
        /**

+        * What the class handles.
+        *

         * @see Walker::$tree_type
         * @since 2.1.0
         * @var string
         * @see Walker::$tree_type
         * @since 2.1.0
         * @var string


@@ -772,6 +772,8 @@ class Walker_Category extends Walker {
        var $tree_type = 'category';
 
        /**
        var $tree_type = 'category';
 
        /**

+        * Database fields to use.
+        *

         * @see Walker::$db_fields
         * @since 2.1.0
         * @todo Decouple this
         * @see Walker::$db_fields
         * @since 2.1.0
         * @todo Decouple this


@@ -780,12 +782,16 @@ class Walker_Category extends Walker {
        var $db_fields = array ('parent' => 'parent', 'id' => 'term_id');
 
        /**
        var $db_fields = array ('parent' => 'parent', 'id' => 'term_id');
 
        /**

+        * Starts the list before the elements are added.
+        *

         * @see Walker::start_lvl()
         * @see Walker::start_lvl()

+        *

         * @since 2.1.0
         *
         * @param string $output Passed by reference. Used to append additional content.
         * @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'] )
         */
        function start_lvl( &$output, $depth = 0, $args = array() ) {
                if ( 'list' != $args['style'] )


@@ -796,12 +802,16 @@ class Walker_Category extends Walker {
        }
 
        /**
        }
 
        /**

+        * Ends the list of after the elements are added.
+        *

         * @see Walker::end_lvl()
         * @see Walker::end_lvl()

+        *

         * @since 2.1.0
         *
         * @param string $output Passed by reference. Used to append additional content.
         * @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'] )
         */
        function end_lvl( &$output, $depth = 0, $args = array() ) {
                if ( 'list' != $args['style'] )


@@ -812,13 +822,17 @@ class Walker_Category extends Walker {
        }
 
        /**
        }
 
        /**

+        * Start the element output.
+        *

         * @see Walker::start_el()
         * @see Walker::start_el()

+        *

         * @since 2.1.0
         *
         * @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 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);
         */
        function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
                extract($args);


@@ -884,13 +898,16 @@ class Walker_Category extends Walker {
        }
 
        /**
        }
 
        /**

+        * Ends the element output, if needed.
+        *

         * @see Walker::end_el()
         * @see Walker::end_el()

+        *

         * @since 2.1.0
         *
         * @param string $output Passed by reference. Used to append additional content.
         * @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'] )
         */
        function end_el( &$output, $page, $depth = 0, $args = array() ) {
                if ( 'list' != $args['style'] )


@@ -925,13 +942,15 @@ class Walker_CategoryDropdown extends Walker {
        var $db_fields = array ('parent' => 'parent', 'id' => 'term_id');
 
        /**
        var $db_fields = array ('parent' => 'parent', 'id' => 'term_id');
 
        /**

+        * Start the element output.
+        *

         * @see Walker::start_el()
         * @since 2.1.0
         *
         * @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 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(' ', $depth * 3);
         */
        function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
                $pad = str_repeat(' ', $depth * 3);


@@ -1039,10 +1058,12 @@ function tag_description( $tag = 0 ) {
  * @return string Term description, available.
  */
 function term_description( $term = 0, $taxonomy = 'post_tag' ) {
  * @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();
                $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;
        }
        $description = get_term_field( 'description', $term, $taxonomy );
        return is_wp_error( $description ) ? '' : $description;