Changeset 13922

Timestamp:

04/02/2010 12:07:59 AM (15 years ago)

Author:

dd32

Message:

Handle uppercase html entities in get_next_posts_link() & get_next_comments_link() (and family) $labels. Fixes #4152

File:

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

trunk/wp-includes/link-template.php

@@ -1460 +1460 @@
     global $paged, $wp_query;
 
-    if ( !$max_page ) {
+    if ( !$max_page )
         $max_page = $wp_query->max_num_pages;
-    }
 
     if ( !$paged )
@@ -1471 +1470 @@
     if ( !is_single() && ( empty($paged) || $nextpage <= $max_page) ) {
         $attr = apply_filters( 'next_posts_link_attributes', '' );
-        return '<a href="' . next_posts( $max_page, false ) . "\" $attr>". preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
+        return '<a href="' . next_posts( $max_page, false ) . "\" $attr>" . preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) . '</a>';
     }
 }
@@ -1586 +1585 @@
         if ( $max_num_pages > 1 ) {
             $return = get_previous_posts_link($args['prelabel']);
-            $return .= preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $args['sep']);
+            $return .= preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $args['sep']);
             $return .= get_next_posts_link($args['nxtlabel']);
         }
@@ -1675 +1674 @@
         $label = __('Newer Comments &raquo;');
 
-    return '<a href="' . esc_url( get_comments_pagenum_link( $nextpage, $max_page ) ) . '" ' . apply_filters( 'next_comments_link_attributes', '' ) . '>'. preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
+    return '<a href="' . esc_url( get_comments_pagenum_link( $nextpage, $max_page ) ) . '" ' . apply_filters( 'next_comments_link_attributes', '' ) . '>'. preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) .'</a>';
 }
 
@@ -1712 +1711 @@
         $label = __('&laquo; Older Comments');
 
-    return '<a href="' . esc_url( get_comments_pagenum_link( $prevpage ) ) . '" ' . apply_filters( 'previous_comments_link_attributes', '' ) . '>' . preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
+    return '<a href="' . esc_url( get_comments_pagenum_link( $prevpage ) ) . '" ' . apply_filters( 'previous_comments_link_attributes', '' ) . '>' . preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) .'</a>';
 }