From a96e0dff91665b70b352672544f000f6cf5d3dc8 Mon Sep 17 00:00:00 2001 From: nacin Date: Thu, 15 Sep 2011 16:54:59 +0000 Subject: [PATCH] Remove support for , end, up, and index. These rel="" values have been dropped by the HTML Working Group. props Elpie, kawauso, fixes #18128. git-svn-id: http://svn.automattic.com/wordpress/trunk@18680 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/default-filters.php | 3 - wp-includes/deprecated.php | 128 ++++++++++++++++++++++++++++++++ wp-includes/link-template.php | 110 --------------------------- 3 files changed, 128 insertions(+), 113 deletions(-) diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php index 64e193fc55..009fe08bc4 100644 --- a/wp-includes/default-filters.php +++ b/wp-includes/default-filters.php @@ -203,9 +203,6 @@ add_action( 'wp_head', 'feed_links', 2 ); add_action( 'wp_head', 'feed_links_extra', 3 ); add_action( 'wp_head', 'rsd_link' ); add_action( 'wp_head', 'wlwmanifest_link' ); -add_action( 'wp_head', 'index_rel_link' ); -add_action( 'wp_head', 'parent_post_rel_link', 10, 0 ); -add_action( 'wp_head', 'start_post_rel_link', 10, 0 ); add_action( 'wp_head', 'adjacent_posts_rel_link_wp_head', 10, 0 ); add_action( 'wp_head', 'locale_stylesheet' ); add_action( 'publish_future_post', 'check_and_publish_future_post', 10, 1 ); diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index 770dc40108..39ef46a733 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -2721,3 +2721,131 @@ function sanitize_user_object($user, $context = 'display') { return $user; } + +/** + * Get boundary post relational link. + * + * Can either be start or end post relational link. + * + * @since 2.8.0 + * @deprecated 3.3 + * + * @param string $title Optional. Link title format. + * @param bool $in_same_cat Optional. Whether link should be in same category. + * @param string $excluded_categories Optional. Excluded categories IDs. + * @param bool $start Optional, default is true. Whether display link to first or last post. + * @return string + */ +function get_boundary_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '', $start = true) { + _deprecated_function( __FUNCTION__, '3.3' ); + + $posts = get_boundary_post($in_same_cat, $excluded_categories, $start); + // If there is no post stop. + if ( empty($posts) ) + return; + + // Even though we limited get_posts to return only 1 item it still returns an array of objects. + $post = $posts[0]; + + if ( empty($post->post_title) ) + $post->post_title = $start ? __('First Post') : __('Last Post'); + + $date = mysql2date(get_option('date_format'), $post->post_date); + + $title = str_replace('%title', $post->post_title, $title); + $title = str_replace('%date', $date, $title); + $title = apply_filters('the_title', $title, $post->ID); + + $link = $start ? "\n"; + + $boundary = $start ? 'start' : 'end'; + return apply_filters( "{$boundary}_post_rel_link", $link ); +} + +/** + * Display relational link for the first post. + * + * @since 2.8.0 + * @deprecated 3.3 + * + * @param string $title Optional. Link title format. + * @param bool $in_same_cat Optional. Whether link should be in same category. + * @param string $excluded_categories Optional. Excluded categories IDs. + */ +function start_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') { + _deprecated_function( __FUNCTION__, '3.3' ); + + echo get_boundary_post_rel_link($title, $in_same_cat, $excluded_categories, true); +} + +/** + * Get site index relational link. + * + * @since 2.8.0 + * @deprecated 3.3 + * + * @return string + */ +function get_index_rel_link() { + _deprecated_function( __FUNCTION__, '3.3' ); + + $link = "\n"; + return apply_filters( "index_rel_link", $link ); +} + +/** + * Display relational link for the site index. + * + * @since 2.8.0 + * @deprecated 3.3 + */ +function index_rel_link() { + _deprecated_function( __FUNCTION__, '3.3' ); + + echo get_index_rel_link(); +} + +/** + * Get parent post relational link. + * + * @since 2.8.0 + * @deprecated 3.3 + * + * @param string $title Optional. Link title format. + * @return string + */ +function get_parent_post_rel_link($title = '%title') { + _deprecated_function( __FUNCTION__, '3.3' ); + + if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) ) + $post = & get_post($GLOBALS['post']->post_parent); + + if ( empty($post) ) + return; + + $date = mysql2date(get_option('date_format'), $post->post_date); + + $title = str_replace('%title', $post->post_title, $title); + $title = str_replace('%date', $date, $title); + $title = apply_filters('the_title', $title, $post->ID); + + $link = "\n"; + + return apply_filters( "parent_post_rel_link", $link ); +} + +/** + * Display relational link for parent item + * + * @since 2.8.0 + * @deprecated 3.3 + */ +function parent_post_rel_link($title = '%title') { + _deprecated_function( __FUNCTION__, '3.3' ); + + echo get_parent_post_rel_link($title); +} \ No newline at end of file diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index f12bd90116..ca56f0532d 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -1299,116 +1299,6 @@ function get_boundary_post( $in_same_cat = false, $excluded_categories = '', $st return get_posts( array('numberposts' => 1, 'category' => $categories, 'order' => $order, 'update_post_term_cache' => false, 'update_post_meta_cache' => false) ); } -/** - * Get boundary post relational link. - * - * Can either be start or end post relational link. - * - * @since 2.8.0 - * - * @param string $title Optional. Link title format. - * @param bool $in_same_cat Optional. Whether link should be in same category. - * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs. - * @param bool $start Optional, default is true. Whether display link to first or last post. - * @return string - */ -function get_boundary_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '', $start = true) { - $posts = get_boundary_post($in_same_cat, $excluded_categories, $start); - // If there is no post stop. - if ( empty($posts) ) - return; - - // Even though we limited get_posts to return only 1 item it still returns an array of objects. - $post = $posts[0]; - - if ( empty($post->post_title) ) - $post->post_title = $start ? __('First Post') : __('Last Post'); - - $date = mysql2date(get_option('date_format'), $post->post_date); - - $title = str_replace('%title', $post->post_title, $title); - $title = str_replace('%date', $date, $title); - $title = apply_filters('the_title', $title, $post->ID); - - $link = $start ? "\n"; - - $boundary = $start ? 'start' : 'end'; - return apply_filters( "{$boundary}_post_rel_link", $link ); -} - -/** - * Display relational link for the first post. - * - * @since 2.8.0 - * - * @param string $title Optional. Link title format. - * @param bool $in_same_cat Optional. Whether link should be in same category. - * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs. - */ -function start_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') { - echo get_boundary_post_rel_link($title, $in_same_cat, $excluded_categories, true); -} - -/** - * Get site index relational link. - * - * @since 2.8.0 - * - * @return string - */ -function get_index_rel_link() { - $link = "\n"; - return apply_filters( "index_rel_link", $link ); -} - -/** - * Display relational link for the site index. - * - * @since 2.8.0 - */ -function index_rel_link() { - echo get_index_rel_link(); -} - -/** - * Get parent post relational link. - * - * @since 2.8.0 - * - * @param string $title Optional. Link title format. - * @return string - */ -function get_parent_post_rel_link($title = '%title') { - if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) ) - $post = & get_post($GLOBALS['post']->post_parent); - - if ( empty($post) ) - return; - - $date = mysql2date(get_option('date_format'), $post->post_date); - - $title = str_replace('%title', $post->post_title, $title); - $title = str_replace('%date', $date, $title); - $title = apply_filters('the_title', $title, $post->ID); - - $link = "\n"; - - return apply_filters( "parent_post_rel_link", $link ); -} - -/** - * Display relational link for parent item - * - * @since 2.8.0 - */ -function parent_post_rel_link($title = '%title') { - echo get_parent_post_rel_link($title); -} - /** * Display previous post link that is adjacent to the current post. *