Ticket #17182: general-template.diff

wp-includes/general-template.php

@@ -28 +28 @@
         if ( isset($name) )
                 $templates[] = "header-{$name}.php";
 
-        $templates[] = "header.php";
+        $templates[] = 'header.php';
 
         // Backward compat code will be removed in a future release
         if ('' == locate_template($templates, true))
@@ -57 +57 @@
         if ( isset($name) )
                 $templates[] = "footer-{$name}.php";
 
-        $templates[] = "footer.php";
+        $templates[] = 'footer.php';
 
         // Backward compat code will be removed in a future release
         if ('' == locate_template($templates, true))
@@ -86 +86 @@
         if ( isset($name) )
                 $templates[] = "sidebar-{$name}.php";
 
-        $templates[] = "sidebar.php";
+        $templates[] = 'sidebar.php';
 
         // Backward compat code will be removed in a future release
         if ('' == locate_template($templates, true))
@@ -569 +569 @@
                 $my_year = substr($m, 0, 4);
                 $my_month = $wp_locale->get_month(substr($m, 4, 2));
                 $my_day = intval(substr($m, 6, 2));
-                $title = $my_year . ($my_month ? $t_sep . $my_month : "") . ($my_day ? $t_sep . $my_day : "");
+                $title = $my_year . ($my_month ? $t_sep . $my_month : '') . ($my_day ? $t_sep . $my_day : '');
         }
 
         // If there's a year
@@ -843 +843 @@
         else // custom
                 $link_html = "\t$before<a href='$url' title='$title_text'>$text</a>$after\n";
 
-        $link_html = apply_filters( "get_archives_link", $link_html );
+        $link_html = apply_filters( 'get_archives_link', $link_html );
 
         return $link_html;
 }
@@ -916 +916 @@
 
         //filters
         $where = apply_filters('getarchives_where', "WHERE post_type = 'post' AND post_status = 'publish'", $r );
-        $join = apply_filters('getarchives_join', "", $r);
+        $join = apply_filters('getarchives_join', '', $r);
 
         $output = '';
 
@@ -1016 +1016 @@
                                 }
                 }
         } elseif ( ( 'postbypost' == $type ) || ('alpha' == $type) ) {
-                $orderby = ('alpha' == $type) ? "post_title ASC " : "post_date DESC ";
+                $orderby = ('alpha' == $type) ? 'post_title ASC ' : 'post_date DESC ';
                 $query = "SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit";
                 $key = md5($query);
                 $cache = wp_cache_get( 'wp_get_archives' , 'general');
@@ -1210 +1210 @@
                 $ak_title_separator = ', ';
 
         $ak_titles_for_day = array();
-        $ak_post_titles = $wpdb->get_results("SELECT ID, post_title, DAYOFMONTH(post_date) as dom "
+        $ak_post_titles = $wpdb->get_results('SELECT ID, post_title, DAYOFMONTH(post_date) as dom '
                 ."FROM $wpdb->posts "
                 ."WHERE post_date >= '{$thisyear}-{$thismonth}-01 00:00:00' "
                 ."AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59' "
@@ -1248 +1248 @@
                         $calendar_output .= '<td>';
 
                 if ( in_array($day, $daywithpost) ) // any posts today?
-                                $calendar_output .= '<a href="' . get_day_link($thisyear, $thismonth, $day) . "\" title=\"" . esc_attr($ak_titles_for_day[$day]) . "\">$day</a>";
+                                $calendar_output .= '<a href="' . get_day_link($thisyear, $thismonth, $day) . '" title="' . esc_attr($ak_titles_for_day[$day]) . "\">$day</a>";
                 else
                         $calendar_output .= $day;
                 $calendar_output .= '</td>';
@@ -1990 +1990 @@
                 if ( $add_args )
                         $link = add_query_arg( $add_args, $link );
                 $link .= $add_fragment;
-                $page_links[] = "<a class='prev page-numbers' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>$prev_text</a>";
+                $page_links[] = '<a class="prev page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . esc_html( $prev_text ) . '</a>';
         endif;
         for ( $n = 1; $n <= $total; $n++ ) :
                 $n_display = number_format_i18n($n);
@@ -2007 +2007 @@
                                 $page_links[] = "<a class='page-numbers' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>$n_display</a>";
                                 $dots = true;
                         elseif ( $dots && !$show_all ) :
-                                $page_links[] = "<span class='page-numbers dots'>...</span>";
+                                $page_links[] = '<span class="page-numbers dots">...</span>';
                                 $dots = false;
                         endif;
                 endif;
@@ -2018 +2018 @@
                 if ( $add_args )
                         $link = add_query_arg( $add_args, $link );
                 $link .= $add_fragment;
-                $page_links[] = "<a class='next page-numbers' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>$next_text</a>";
+                $page_links[] = '<a class="next page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . esc_html( $next_text ) . '</a>';
         endif;
         switch ( $type ) :
                 case 'array' :