Changeset 48409

Timestamp:

07/08/2020 01:26:20 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Widgets: Correct the logic for displaying the after_widget parameter of the Archives widget.

Follow-up to [48349].

Props mukesh27, joyously.
Fixes #50609.

Location:

trunk/src/wp-includes

Files:

• general-template.php (modified) (1 diff)
• widgets/class-wp-widget-archives.php (modified) (2 diffs)
• widgets/class-wp-widget-meta.php (modified) (1 diff)
• widgets/class-wp-widget-recent-posts.php (modified) (1 diff)

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

@@ -313 +313 @@
             $aria_label = '';
         }
+
         if ( 'html5' === $format ) {
             $form = '<form role="search" ' . $aria_label . 'method="get" class="search-form" action="' . esc_url( home_url( '/' ) ) . '">

trunk/src/wp-includes/widgets/class-wp-widget-archives.php

@@ -162 +162 @@
                 ?>
             </ul>
+
             <?php if ( 'html5' === $format ) : ?>
                 </nav>
@@ -167 +168 @@
 
             <?php
-            echo $args['after_widget'];
         }
+
+        echo $args['after_widget'];
     }
 

trunk/src/wp-includes/widgets/class-wp-widget-meta.php

@@ -67 +67 @@
         }
         ?>
-
 
         <ul>

trunk/src/wp-includes/widgets/class-wp-widget-recent-posts.php

@@ -126 +126 @@
             <?php endforeach; ?>
         </ul>
+
         <?php if ( 'html5' === $format ) : ?>
             </nav>