Changeset 32965

Timestamp:

06/27/2015 01:11:45 AM (11 years ago)

Author:

wonderboymusic

Message:

ob_get_contents() followed by ob_end_clean() can be replaced by ob_get_clean().

See #32444.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (4 diffs)
• wp-admin/includes/class-wp-upgrader-skins.php (modified) (1 diff)
• wp-admin/includes/plugin.php (modified) (2 diffs)
• wp-admin/includes/theme.php (modified) (2 diffs)
• wp-includes/class-wp-customize-control.php (modified) (1 diff)
• wp-includes/class-wp-customize-panel.php (modified) (1 diff)
• wp-includes/class-wp-customize-section.php (modified) (1 diff)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -435 +435 @@
                 if ( $parent ) // Do these all at once in a second
                         continue;
+
                 ob_start();
-                        wp_terms_checklist( 0, array( 'taxonomy' => $taxonomy->name, 'descendants_and_self' => $cat_id, 'selected_cats' => $checked_categories, 'popular_cats' => $popular_ids ));
-                $data = ob_get_contents();
-                ob_end_clean();
+
+                wp_terms_checklist( 0, array( 'taxonomy' => $taxonomy->name, 'descendants_and_self' => $cat_id, 'selected_cats' => $checked_categories, 'popular_cats' => $popular_ids ));
+
+                $data = ob_get_clean();
+
                 $add = array(
                         'what' => $taxonomy->name,
@@ -459 +462 @@
 
                 ob_start();
-                        wp_terms_checklist( 0, array('taxonomy' => $taxonomy->name, 'descendants_and_self' => $term_id, 'selected_cats' => $checked_categories, 'popular_cats' => $popular_ids));
-                $data = ob_get_contents();
-                ob_end_clean();
+
+                wp_terms_checklist( 0, array('taxonomy' => $taxonomy->name, 'descendants_and_self' => $term_id, 'selected_cats' => $checked_categories, 'popular_cats' => $popular_ids));
+
+                $data = ob_get_clean();
+
                 $add = array(
                         'what' => $taxonomy->name,
@@ -471 +476 @@
 
         ob_start();
-                wp_dropdown_categories( array(
-                        'taxonomy' => $taxonomy->name, 'hide_empty' => 0, 'name' => 'new'.$taxonomy->name.'_parent', 'orderby' => 'name',
-                        'hierarchical' => 1, 'show_option_none' => '— '.$taxonomy->labels->parent_item.' —'
-                ) );
-        $sup = ob_get_contents();
-        ob_end_clean();
+
+        wp_dropdown_categories( array(
+                'taxonomy' => $taxonomy->name, 'hide_empty' => 0, 'name' => 'new'.$taxonomy->name.'_parent', 'orderby' => 'name',
+                'hierarchical' => 1, 'show_option_none' => '— '.$taxonomy->labels->parent_item.' —'
+        ) );
+
+        $sup = ob_get_clean();
+
         $add['supplemental'] = array( 'newcat_parent' => $sup );
 
@@ -915 +922 @@
                 $wp_list_table->single_row( $comment );
         }
-        $comment_list_item = ob_get_contents();
-        ob_end_clean();
+        $comment_list_item = ob_get_clean();
 
         $x->add( array(

trunk/src/wp-admin/includes/class-wp-upgrader-skins.php

@@ -948 +948 @@
          */
         public function footer() {
-                $output = ob_get_contents();
+                $output = ob_get_clean();
                 if ( ! empty( $output ) )
                         $this->feedback( $output );
-                ob_end_clean();
         }
 }

trunk/src/wp-admin/includes/plugin.php

@@ -772 +772 @@
         $url = wp_nonce_url('plugins.php?action=delete-selected&verify-delete=1&' . implode('&', $checked), 'bulk-plugins');
         if ( false === ($credentials = request_filesystem_credentials($url)) ) {
-                $data = ob_get_contents();
-                ob_end_clean();
+                $data = ob_get_clean();
+
                 if ( ! empty($data) ){
                         include_once( ABSPATH . 'wp-admin/admin-header.php');
@@ -785 +785 @@
         if ( ! WP_Filesystem($credentials) ) {
                 request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
-                $data = ob_get_contents();
-                ob_end_clean();
+                $data = ob_get_clean();
+
                 if ( ! empty($data) ){
                         include_once( ABSPATH . 'wp-admin/admin-header.php');

trunk/src/wp-admin/includes/theme.php

@@ -28 +28 @@
                 $redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet);
         if ( false === ($credentials = request_filesystem_credentials($redirect)) ) {
-                $data = ob_get_contents();
-                ob_end_clean();
+                $data = ob_get_clean();
+
                 if ( ! empty($data) ){
                         include_once( ABSPATH . 'wp-admin/admin-header.php');
@@ -41 +41 @@
         if ( ! WP_Filesystem($credentials) ) {
                 request_filesystem_credentials($redirect, '', true); // Failed to connect, Error and request again
-                $data = ob_get_contents();
-                ob_end_clean();
+                $data = ob_get_clean();
+
                 if ( ! empty($data) ) {
                         include_once( ABSPATH . 'wp-admin/admin-header.php');

trunk/src/wp-includes/class-wp-customize-control.php

@@ -302 +302 @@
                 ob_start();
                 $this->maybe_render();
-                $template = trim( ob_get_contents() );
-                ob_end_clean();
-                return $template;
+                return trim( ob_get_clean() );
         }
 

trunk/src/wp-includes/class-wp-customize-panel.php

@@ -253 +253 @@
                 ob_start();
                 $this->maybe_render();
-                $template = trim( ob_get_contents() );
-                ob_end_clean();
-                return $template;
+                return trim( ob_get_clean() );
         }
 

trunk/src/wp-includes/class-wp-customize-section.php

@@ -270 +270 @@
                 ob_start();
                 $this->maybe_render();
-                $template = trim( ob_get_contents() );
-                ob_end_clean();
-                return $template;
+                return trim( ob_get_clean() );
         }