<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[32965] trunk/src: `ob_get_contents()` followed by `ob_end_clean()` can be replaced by `ob_get_clean()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/32965">32965</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32965","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-06-27 01:11:45 +0000 (Sat, 27 Jun 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>`ob_get_contents()` followed by `ob_end_clean()` can be replaced by `ob_get_clean()`.
See <a href="https://core.trac.wordpress.org/ticket/32444">#32444</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderskinsphp">trunk/src/wp-admin/includes/class-wp-upgrader-skins.php</a></li>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizecontrolphp">trunk/src/wp-includes/class-wp-customize-control.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizepanelphp">trunk/src/wp-includes/class-wp-customize-panel.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizesectionphp">trunk/src/wp-includes/class-wp-customize-section.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2015-06-27 01:02:12 UTC (rev 32964)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2015-06-27 01:11:45 UTC (rev 32965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -434,10 +434,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $checked_categories[] = $cat_id;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $parent ) // Do these all at once in a second
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 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();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $add = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => $taxonomy->name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $cat_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,9 +461,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 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();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $add = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => $taxonomy->name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $term_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,12 +475,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 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();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $add['supplemental'] = array( 'newcat_parent' => $sup );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $x = new WP_Ajax_Response( $add );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -914,8 +921,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> get_comment( $comment );
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table->single_row( $comment );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_list_item = ob_get_contents();
- ob_end_clean();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_list_item = ob_get_clean();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $x->add( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'comments',
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpupgraderskinsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-upgrader-skins.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-upgrader-skins.php 2015-06-27 01:02:12 UTC (rev 32964)
+++ trunk/src/wp-admin/includes/class-wp-upgrader-skins.php 2015-06-27 01:11:45 UTC (rev 32965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -947,9 +947,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function footer() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output = ob_get_contents();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output = ob_get_clean();
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $output ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $this->feedback( $output );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ob_end_clean();
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludespluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin.php 2015-06-27 01:02:12 UTC (rev 32964)
+++ trunk/src/wp-admin/includes/plugin.php 2015-06-27 01:11:45 UTC (rev 32965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -771,8 +771,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> $url = wp_nonce_url('plugins.php?action=delete-selected&verify-delete=1&' . implode('&', $checked), 'bulk-plugins');
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === ($credentials = request_filesystem_credentials($url)) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = ob_get_contents();
- ob_end_clean();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = ob_get_clean();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty($data) ){
</span><span class="cx" style="display: block; padding: 0 10px"> include_once( ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx" style="display: block; padding: 0 10px"> echo $data;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -784,8 +784,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! WP_Filesystem($credentials) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = ob_get_contents();
- ob_end_clean();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = ob_get_clean();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty($data) ){
</span><span class="cx" style="display: block; padding: 0 10px"> include_once( ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx" style="display: block; padding: 0 10px"> echo $data;
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme.php 2015-06-27 01:02:12 UTC (rev 32964)
+++ trunk/src/wp-admin/includes/theme.php 2015-06-27 01:11:45 UTC (rev 32965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,8 +27,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $redirect ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === ($credentials = request_filesystem_credentials($redirect)) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = ob_get_contents();
- ob_end_clean();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = ob_get_clean();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty($data) ){
</span><span class="cx" style="display: block; padding: 0 10px"> include_once( ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx" style="display: block; padding: 0 10px"> echo $data;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,8 +40,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! WP_Filesystem($credentials) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> request_filesystem_credentials($redirect, '', true); // Failed to connect, Error and request again
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = ob_get_contents();
- ob_end_clean();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = ob_get_clean();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty($data) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> include_once( ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx" style="display: block; padding: 0 10px"> echo $data;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizecontrolphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-control.php 2015-06-27 01:02:12 UTC (rev 32964)
+++ trunk/src/wp-includes/class-wp-customize-control.php 2015-06-27 01:11:45 UTC (rev 32965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,9 +301,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> final public function get_content() {
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->maybe_render();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $template = trim( ob_get_contents() );
- ob_end_clean();
- return $template;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return trim( ob_get_clean() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizepanelphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-panel.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-panel.php 2015-06-27 01:02:12 UTC (rev 32964)
+++ trunk/src/wp-includes/class-wp-customize-panel.php 2015-06-27 01:11:45 UTC (rev 32965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,9 +252,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> final public function get_content() {
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->maybe_render();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $template = trim( ob_get_contents() );
- ob_end_clean();
- return $template;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return trim( ob_get_clean() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizesectionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-section.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-section.php 2015-06-27 01:02:12 UTC (rev 32964)
+++ trunk/src/wp-includes/class-wp-customize-section.php 2015-06-27 01:11:45 UTC (rev 32965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,9 +269,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> final public function get_content() {
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->maybe_render();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $template = trim( ob_get_contents() );
- ob_end_clean();
- return $template;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return trim( ob_get_clean() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>