Changes from branches/2.7/wp-includes/link-template.php at r10425 to trunk/wp-includes/link-template.php at r10150

File:

• trunk/wp-includes/link-template.php (modified) (9 diffs)

trunk/wp-includes/link-template.php

@@ -93 +93 @@
         );
 
-        if ( is_object($id) && isset($id->filter) && 'sample' == $id->filter )
-                $post = $id;
-        else
-                $post = &get_post($id);
+        $post = &get_post($id);
 
         if ( empty($post->ID) ) return false;
@@ -726 +723 @@
         }
 
-        $link = '<a class="post-edit-link" href="' . get_edit_post_link( $post->ID ) . '" title="' . attribute_escape( __( 'Edit post' ) ) . '">' . $link . '</a>';
+        $link = '<a href="' . get_edit_post_link( $post->ID ) . '" title="' . attribute_escape( __( 'Edit post' ) ) . '">' . $link . '</a>';
         echo $before . apply_filters( 'edit_post_link', $link, $post->ID ) . $after;
 }
@@ -776 +773 @@
         }
 
-        $link = '<a class="comment-edit-link" href="' . get_edit_comment_link( $comment->comment_ID ) . '" title="' . __( 'Edit comment' ) . '">' . $link . '</a>';
+        $link = '<a href="' . get_edit_comment_link( $comment->comment_ID ) . '" title="' . __( 'Edit comment' ) . '">' . $link . '</a>';
         echo $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID ) . $after;
 }
@@ -1246 +1243 @@
 
 /**
- * Return the link to next comments pages.
- *
- * @since 2.7.1
+ * Display link to next comments pages.
+ *
+ * @since 2.7.0
  *
  * @param string $label Optional. Label for link text.
  * @param int $max_page Optional. Max page.
- * @return string|null
- */
-function get_next_comments_link( $label = '', $max_page = 0 ) {
+ */
+function next_comments_link($label='', $max_page = 0) {
         global $wp_query;
 
@@ -1262 +1258 @@
         $page = get_query_var('cpage');
 
+        if ( !$page )
+                $page = 1;
+
         $nextpage = intval($page) + 1;
 
@@ -1276 +1275 @@
                 $label = __('Newer Comments &raquo;');
 
-        return '<a href="' . clean_url( get_comments_pagenum_link( $nextpage, $max_page ) ) . '" ' . apply_filters( 'next_comments_link_attributes', '' ) . '>'. preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
-}
-
-/**
- * Display the link to next comments pages.
+        echo '<a href="' . clean_url( get_comments_pagenum_link( $nextpage, $max_page ) );
+        $attr = apply_filters( 'next_comments_link_attributes', '' );
+        echo "\" $attr>". preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
+}
+
+/**
+ * Display the previous comments page link.
  *
  * @since 2.7.0
  *
- * @param string $label Optional. Label for link text.
- * @param int $max_page Optional. Max page.
- */
-function next_comments_link( $label = '', $max_page = 0 ) {
-        echo get_next_comments_link( $label, $max_page );
-}
-
-/**
- * Return the previous comments page link.
- *
- * @since 2.7.1
- *
  * @param string $label Optional. Label for comments link text.
- * @return string|null
- */
-function get_previous_comments_link( $label = '' ) {
+ */
+function previous_comments_link($label='') {
+
         if ( !is_singular() )
                 return;
@@ -1305 +1294 @@
         $page = get_query_var('cpage');
 
-        if ( intval($page) <= 1 )
+        if ( !$page )
+                $page = 1;
+
+        if ( $page <= 1 )
                 return;
 
@@ -1313 +1305 @@
                 $label = __('&laquo; Older Comments');
 
-        return '<a href="' . clean_url( get_comments_pagenum_link( $prevpage ) ) . '" ' . apply_filters( 'previous_comments_link_attributes', '' ) . '>' . preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
-}
-
-/**
- * Display the previous comments page link.
- *
- * @since 2.7.0
- *
- * @param string $label Optional. Label for comments link text.
- */
-function previous_comments_link( $label = '' ) {
-        echo get_previous_comments_link( $label );
+        echo '<a href="' . clean_url(get_comments_pagenum_link($prevpage));
+        $attr = apply_filters( 'previous_comments_link_attributes', '' );
+        echo "\" $attr>". preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
 }
 
@@ -1355 +1338 @@
         );
         if ( $wp_rewrite->using_permalinks() )
-                $defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . 'comment-page-%#%', 'commentpaged');
+                $defaults['base'] = user_trailingslashit(get_permalink() . 'comment-page-%#%', 'commentpaged');
 
         $args = wp_parse_args( $args, $defaults );