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

Remove old show_last_update/include_last_update_time/show_date code from category template functions. Props solarissmoke. Fixes #19953. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19927 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
duck_ 2012-02-15 16:46:01 +00:00
parent c7bd56a21d
commit 0f26dd5fa8
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wp-includes/category-template.php
View File

@ -271,7 +271,6 @@ function category_description( $category = 0 ) {
* 'orderby' (string) default is 'ID' - What column to use for ordering the * 'orderby' (string) default is 'ID' - What column to use for ordering the
* categories. * categories.
* 'order' (string) default is 'ASC' - What direction to order categories. * 'order' (string) default is 'ASC' - What direction to order categories.
* 'show_last_update' (bool|int) default is 0 - See {@link get_categories()}
* 'show_count' (bool|int) default is 0 - Whether to show how many posts are * 'show_count' (bool|int) default is 0 - Whether to show how many posts are
* in the category. * in the category.
* 'hide_empty' (bool|int) default is 1 - Whether to hide categories that * 'hide_empty' (bool|int) default is 1 - Whether to hide categories that
@ -301,7 +300,7 @@ function wp_dropdown_categories( $args = '' ) {
$defaults = array( $defaults = array(
'show_option_all' => '', 'show_option_none' => '', 'show_option_all' => '', 'show_option_none' => '',
'orderby' => 'id', 'order' => 'ASC', 'orderby' => 'id', 'order' => 'ASC',
'show_last_update' => 0, 'show_count' => 0, 'show_count' => 0,
'hide_empty' => 1, 'child_of' => 0, 'hide_empty' => 1, 'child_of' => 0,
'exclude' => '', 'echo' => 1, 'exclude' => '', 'echo' => 1,
'selected' => 0, 'hierarchical' => 0, 'selected' => 0, 'hierarchical' => 0,
@ -325,7 +324,6 @@ function wp_dropdown_categories( $args = '' ) {
$r['pad_counts'] = true; $r['pad_counts'] = true;
} }
$r['include_last_update_time'] = $r['show_last_update'];
extract( $r ); extract( $r );
$tab_index_attribute = ''; $tab_index_attribute = '';
@ -388,8 +386,6 @@ function wp_dropdown_categories( $args = '' ) {
* 'orderby' (string) default is 'ID' - What column to use for ordering the * 'orderby' (string) default is 'ID' - What column to use for ordering the
* categories. * categories.
* 'order' (string) default is 'ASC' - What direction to order categories. * 'order' (string) default is 'ASC' - What direction to order categories.
* 'show_last_update' (bool|int) default is 0 - See {@link
* walk_category_dropdown_tree()}
* 'show_count' (bool|int) default is 0 - Whether to show how many posts are * 'show_count' (bool|int) default is 0 - Whether to show how many posts are
* in the category. * in the category.
* 'hide_empty' (bool|int) default is 1 - Whether to hide categories that * 'hide_empty' (bool|int) default is 1 - Whether to hide categories that
@ -417,7 +413,7 @@ function wp_list_categories( $args = '' ) {
$defaults = array( $defaults = array(
'show_option_all' => '', 'show_option_none' => __('No categories'), 'show_option_all' => '', 'show_option_none' => __('No categories'),
'orderby' => 'name', 'order' => 'ASC', 'orderby' => 'name', 'order' => 'ASC',
'show_last_update' => 0, 'style' => 'list', 'style' => 'list',
'show_count' => 0, 'hide_empty' => 1, 'show_count' => 0, 'hide_empty' => 1,
'use_desc_for_title' => 1, 'child_of' => 0, 'use_desc_for_title' => 1, 'child_of' => 0,
'feed' => '', 'feed_type' => '', 'feed' => '', 'feed_type' => '',
@ -433,9 +429,6 @@ function wp_list_categories( $args = '' ) {
if ( !isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) if ( !isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] )
$r['pad_counts'] = true; $r['pad_counts'] = true;
if ( isset( $r['show_date'] ) )
$r['include_last_update_time'] = $r['show_date'];
if ( true == $r['hierarchical'] ) { if ( true == $r['hierarchical'] ) {
$r['exclude_tree'] = $r['exclude']; $r['exclude_tree'] = $r['exclude'];
$r['exclude'] = ''; $r['exclude'] = '';
@ -874,9 +867,6 @@ class Walker_Category extends Walker {
if ( !empty($show_count) ) if ( !empty($show_count) )
$link .= ' (' . intval($category->count) . ')'; $link .= ' (' . intval($category->count) . ')';
if ( !empty($show_date) )
$link .= ' ' . gmdate('Y-m-d', $category->last_update_timestamp);
if ( 'list' == $args['style'] ) { if ( 'list' == $args['style'] ) {
$output .= "\t<li"; $output .= "\t<li";
$class = 'cat-item cat-item-' . $category->term_id; $class = 'cat-item cat-item-' . $category->term_id;
@ -942,7 +932,7 @@ class Walker_CategoryDropdown extends Walker {
* @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 int $depth Depth of category. Used for padding.
* @param array $args Uses 'selected', 'show_count', and 'show_last_update' keys, if they exist. * @param array $args Uses 'selected' and 'show_count' keys, if they exist.
*/ */
function start_el( &$output, $category, $depth, $args, $id = 0 ) { function start_el( &$output, $category, $depth, $args, $id = 0 ) {
$pad = str_repeat('&nbsp;', $depth * 3); $pad = str_repeat('&nbsp;', $depth * 3);
@ -955,10 +945,6 @@ class Walker_CategoryDropdown extends Walker {
$output .= $pad.$cat_name; $output .= $pad.$cat_name;
if ( $args['show_count'] ) if ( $args['show_count'] )
$output .= '&nbsp;&nbsp;('. $category->count .')'; $output .= '&nbsp;&nbsp;('. $category->count .')';
if ( $args['show_last_update'] ) {
$format = 'Y-m-d';
$output .= '&nbsp;&nbsp;' . gmdate($format, $category->last_update_timestamp);
}
$output .= "</option>\n"; $output .= "</option>\n";
} }
} }