Changeset 41867 for trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php

Timestamp:

10/15/2017 09:42:52 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Widgets: Move empty title checks out of the apply_filters( 'widget_title' ) calls for clarity.

See #42226.

File:

• trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php (modified) (1 diff)

trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php

@@ -43 +43 @@
                 $nav_menu = ! empty( $instance['nav_menu'] ) ? wp_get_nav_menu_object( $instance['nav_menu'] ) : false;
 
-                if ( !$nav_menu )
+                if ( ! $nav_menu ) {
                         return;
+                }
+
+                $title = ! empty( $instance['title'] ) ? $instance['title'] : '';
 
                 /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-                $instance['title'] = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
+                $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
 
                 echo $args['before_widget'];
 
-                if ( !empty($instance['title']) )
-                        echo $args['before_title'] . $instance['title'] . $args['after_title'];
+                if ( $title ) {
+                        echo $args['before_title'] . $title . $args['after_title'];
+                }
 
                 $nav_menu_args = array(