Changeset 47223

Timestamp:

02/09/2020 08:42:26 PM (5 years ago)

Author:

jorbin

Message:

General: Fix HTML for get_calendar()

The <tfoot> element was allowed to precede the <tbody> element in HTML 5. However, that was changed in HTML 5.1 and <tfoot> must now follow <tbody>.

This removes the tfooot and instead uses a nav element for navigation between months.

Fixes: #39763
Props: isabel_brison, Harry Milatz, audrasjb, abhijitrakas, SergeyBiryukov

File:

• trunk/src/wp-includes/general-template.php (modified) (2 diffs)

trunk/src/wp-includes/general-template.php

@@ -2168 +2168 @@
     </tr>
     </thead>
-
-    <tfoot>
-    <tr>';
-
-    if ( $previous ) {
-        $calendar_output .= "\n\t\t" . '<td colspan="3" id="prev"><a href="' . get_month_link( $previous->year, $previous->month ) . '">&laquo; ' .
-            $wp_locale->get_month_abbrev( $wp_locale->get_month( $previous->month ) ) .
-        '</a></td>';
-    } else {
-        $calendar_output .= "\n\t\t" . '<td colspan="3" id="prev" class="pad">&nbsp;</td>';
-    }
-
-    $calendar_output .= "\n\t\t" . '<td class="pad">&nbsp;</td>';
-
-    if ( $next ) {
-        $calendar_output .= "\n\t\t" . '<td colspan="3" id="next"><a href="' . get_month_link( $next->year, $next->month ) . '">' .
-            $wp_locale->get_month_abbrev( $wp_locale->get_month( $next->month ) ) .
-        ' &raquo;</a></td>';
-    } else {
-        $calendar_output .= "\n\t\t" . '<td colspan="3" id="next" class="pad">&nbsp;</td>';
-    }
-
-    $calendar_output .= '
-    </tr>
-    </tfoot>
-
     <tbody>
     <tr>';
@@ -2261 +2235 @@
         $calendar_output .= "\n\t\t" . '<td class="pad" colspan="' . esc_attr( $pad ) . '">&nbsp;</td>';
     }
-    $calendar_output .= "\n\t</tr>\n\t</tbody>\n\t</table>";
+    $calendar_output .= "\n\t</tr>\n\t</tbody>";
+
+    $calendar_output .= "\n\t</table>";
+
+    $calendar_output .= '<nav aria-label="' . __( 'Previous and next months' ) . '">';
+
+    if ( $previous ) {
+        $calendar_output .= "\n\t\t" . '<span id="prev"><a href="' . get_month_link( $previous->year, $previous->month ) . '">&laquo; ' .
+            $wp_locale->get_month_abbrev( $wp_locale->get_month( $previous->month ) ) .
+        '</a></span>';
+    } else {
+        $calendar_output .= "\n\t\t" . '<span id="prev">&nbsp;</span>';
+    }
+
+    $calendar_output .= "\n\t\t" . '<span class="pad">&nbsp;</span>';
+
+    if ( $next ) {
+        $calendar_output .= "\n\t\t" . '<span id="next"><a href="' . get_month_link( $next->year, $next->month ) . '">' .
+            $wp_locale->get_month_abbrev( $wp_locale->get_month( $next->month ) ) .
+        ' &raquo;</a></span>';
+    } else {
+        $calendar_output .= "\n\t\t" . '<span id="next" class="pad">&nbsp;</span>';
+    }
+
+    $calendar_output .= '
+    </nav>';
 
     $cache[ $key ] = $calendar_output;