Ticket #18128: 18128.diff

wp-includes/default-filters.php

@@ -204 +204 @@
 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 );
 add_action( 'wp_head',             'noindex',                       1     );

wp-includes/deprecated.php

@@ -2615 +2615 @@
 
         return true;
 }
+
+
+/**
+ * Get adjacent post relational link.
+ *
+ * Can either be next or previous 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 $previous Optional, default is true. Whether display link to previous post.
+ * @return string
+ */
+function get_adjacent_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '', $previous = true) {
+        _deprecated_function( __FUNCTION__, '3.3'  );
+
+        if ( $previous && is_attachment() && is_object( $GLOBALS['post'] ) )
+                $post = & get_post($GLOBALS['post']->post_parent);
+        else
+                $post = get_adjacent_post($in_same_cat,$excluded_categories,$previous);
+
+        if ( empty($post) )
+                return;
+
+        if ( empty($post->post_title) )
+                $post->post_title = $previous ? __('Previous Post') : __('Next 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 = $previous ? "<link rel='prev' title='" : "<link rel='next' title='";
+        $link .= esc_attr( $title );
+        $link .= "' href='" . get_permalink($post) . "' />\n";
+
+        $adjacent = $previous ? 'previous' : 'next';
+        return apply_filters( "{$adjacent}_post_rel_link", $link );
+}
+
+/**
+ * Display relational links for the posts adjacent to the current 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 adjacent_posts_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
+        _deprecated_function( __FUNCTION__, '3.3'  );
+
+        echo get_adjacent_post_rel_link($title, $in_same_cat, $excluded_categories = '', true);
+        echo get_adjacent_post_rel_link($title, $in_same_cat, $excluded_categories = '', false);
+}
+
+/**
+ * Display relational links for the posts adjacent to the current post for single post pages.
+ *
+ * This is meant to be attached to actions like 'wp_head'.  Do not call this directly in plugins or theme templates.
+ * @since 3.0.0
+ * @deprecated 3.3
+ *
+ */
+function adjacent_posts_rel_link_wp_head() {
+        _deprecated_function( __FUNCTION__, '3.3'  );
+
+        if ( !is_singular() || is_attachment() )
+                return;
+        adjacent_posts_rel_link();
+}
+
+/**
+ * Display relational link for the next post adjacent to the current 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 next_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
+        _deprecated_function( __FUNCTION__, '3.3'  );
+
+        echo get_adjacent_post_rel_link($title, $in_same_cat, $excluded_categories = '', false);
+}
+
+/**
+ * Display relational link for the previous post adjacent to the current 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 prev_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
+        _deprecated_function( __FUNCTION__, '3.3'  );
+
+        echo get_adjacent_post_rel_link($title, $in_same_cat, $excluded_categories = '', true);
+}
+ No newline at end of file

wp-includes/link-template.php

@@ -1152 +1152 @@
 }
 
 /**
- * Get adjacent post relational link.
- *
- * Can either be next or previous 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 string $excluded_categories Optional. Excluded categories IDs.
- * @param bool $previous Optional, default is true. Whether display link to previous post.
- * @return string
- */
-function get_adjacent_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '', $previous = true) {
-        if ( $previous && is_attachment() && is_object( $GLOBALS['post'] ) )
-                $post = & get_post($GLOBALS['post']->post_parent);
-        else
-                $post = get_adjacent_post($in_same_cat,$excluded_categories,$previous);
-
-        if ( empty($post) )
-                return;
-
-        if ( empty($post->post_title) )
-                $post->post_title = $previous ? __('Previous Post') : __('Next 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 = $previous ? "<link rel='prev' title='" : "<link rel='next' title='";
-        $link .= esc_attr( $title );
-        $link .= "' href='" . get_permalink($post) . "' />\n";
-
-        $adjacent = $previous ? 'previous' : 'next';
-        return apply_filters( "{$adjacent}_post_rel_link", $link );
-}
-
-/**
- * Display relational links for the posts adjacent to the current 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 string $excluded_categories Optional. Excluded categories IDs.
- */
-function adjacent_posts_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
-        echo get_adjacent_post_rel_link($title, $in_same_cat, $excluded_categories = '', true);
-        echo get_adjacent_post_rel_link($title, $in_same_cat, $excluded_categories = '', false);
-}
-
-/**
- * Display relational links for the posts adjacent to the current post for single post pages.
- *
- * This is meant to be attached to actions like 'wp_head'.  Do not call this directly in plugins or theme templates.
- * @since 3.0.0
- *
- */
-function adjacent_posts_rel_link_wp_head() {
-        if ( !is_singular() || is_attachment() )
-                return;
-        adjacent_posts_rel_link();
-}
-
-/**
- * Display relational link for the next post adjacent to the current 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 string $excluded_categories Optional. Excluded categories IDs.
- */
-function next_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
-        echo get_adjacent_post_rel_link($title, $in_same_cat, $excluded_categories = '', false);
-}
-
-/**
- * Display relational link for the previous post adjacent to the current 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 string $excluded_categories Optional. Excluded categories IDs.
- */
-function prev_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
-        echo get_adjacent_post_rel_link($title, $in_same_cat, $excluded_categories = '', true);
-}
-
-/**
  * Retrieve boundary post.
  *
  * Boundary being either the first or last post by publish date within the constraints specified