<!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>[31681] trunk/src: There are a few functions that have the ability to return `false` instead of a string, so the return value should be checked before being passed to functions that expect string.</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/31681">31681</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/31681","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-03-09 02:10:36 +0000 (Mon, 09 Mar 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'>There are a few functions that have the ability to return `false` instead of a string, so the return value should be checked before being passed to functions that expect string.
These are trivial, but they clear out some Scrutinizer issues.
See <a href="https://core.trac.wordpress.org/ticket/30799">#30799</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunksrcwpadmineditformcommentphp">trunk/src/wp-admin/edit-form-comment.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpadminnetworkthemesphp">trunk/src/wp-admin/network/themes.php</a></li>
<li><a href="#trunksrcwpadminpluginsphp">trunk/src/wp-admin/plugins.php</a></li>
<li><a href="#trunksrcwpadminupgradephp">trunk/src/wp-admin/upgrade.php</a></li>
<li><a href="#trunksrcwpincludesclasshttpphp">trunk/src/wp-includes/class-http.php</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditformadvancedphp"></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/edit-form-advanced.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-advanced.php 2015-03-08 23:22:36 UTC (rev 31680)
+++ trunk/src/wp-admin/edit-form-advanced.php 2015-03-09 02:10:36 UTC (rev 31681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -426,6 +426,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post Post object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'post_edit_form_tag', $post );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+$referer = wp_get_referer();
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field($nonce_action); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $user_ID ?>" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -434,7 +436,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" id="post_author" name="post_author" value="<?php echo esc_attr( $post->post_author ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" id="post_type" name="post_type" value="<?php echo esc_attr( $post_type ) ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo esc_attr( $post->post_status) ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<input type="hidden" id="referredby" name="referredby" value="<?php echo esc_url(wp_get_referer()); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<input type="hidden" id="referredby" name="referredby" value="<?php echo $referer ? esc_url( $referer ) : ''; ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $active_post_lock ) ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" id="active_post_lock" value="<?php echo esc_attr( implode( ':', $active_post_lock ) ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpadmineditformcommentphp"></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/edit-form-comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-comment.php 2015-03-08 23:22:36 UTC (rev 31680)
+++ trunk/src/wp-admin/edit-form-comment.php 2015-03-09 02:10:36 UTC (rev 31681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,12 +168,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> do_meta_boxes(null, 'normal', $comment);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$referer = wp_get_referer();
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID) ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="p" value="<?php echo esc_attr($comment->comment_post_ID) ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<input name="referredby" type="hidden" id="referredby" value="<?php echo esc_url( wp_get_referer() ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<input name="referredby" type="hidden" id="referredby" value="<?php echo $referer ? esc_url( $referer ) : ''; ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php wp_original_referer_field(true, 'previous'); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="noredir" value="1" />
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpcommentslisttablephp"></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-comments-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2015-03-08 23:22:36 UTC (rev 31680)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2015-03-09 02:10:36 UTC (rev 31681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -361,6 +361,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = $a_comment;
</span><span class="cx" style="display: block; padding: 0 10px"> $the_comment_class = wp_get_comment_status( $comment->comment_ID );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $the_comment_class ) {
+ $the_comment_class = '';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $the_comment_class = join( ' ', get_comment_class( $the_comment_class, $comment->comment_ID, $comment->comment_post_ID ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $comment->comment_post_ID );
</span></span></pre></div>
<a id="trunksrcwpadminincludespostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2015-03-08 23:22:36 UTC (rev 31680)
+++ trunk/src/wp-admin/includes/post.php 2015-03-09 02:10:36 UTC (rev 31681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1220,9 +1220,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Handle page hierarchy
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ptype->hierarchical ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $uri = get_page_uri($post);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $uri = untrailingslashit($uri);
- $uri = strrev( stristr( strrev( $uri ), '/' ) );
- $uri = untrailingslashit($uri);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $uri ) {
+ $uri = untrailingslashit($uri);
+ $uri = strrev( stristr( strrev( $uri ), '/' ) );
+ $uri = untrailingslashit($uri);
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/edit-tag-form.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $uri = apply_filters( 'editable_slug', $uri );
</span></span></pre></div>
<a id="trunksrcwpadminnetworkthemesphp"></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/network/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/themes.php 2015-03-08 23:22:36 UTC (rev 31680)
+++ trunk/src/wp-admin/network/themes.php 2015-03-09 02:10:36 UTC (rev 31681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field('bulk-themes') ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( _n( 'Yes, Delete this theme', 'Yes, Delete these themes', $themes_to_delete ), 'button', 'submit', false ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <form method="post" action="<?php echo esc_url(wp_get_referer()); ?>" style="display:inline;">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $referer = wp_get_referer();
+ ?>
+ <form method="post" action="<?php echo $referer ? esc_url( $referer ) : ''; ?>" style="display:inline;">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( __( 'No, Return me to the theme list' ), 'button', 'submit', false ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminpluginsphp"></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/plugins.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugins.php 2015-03-08 23:22:36 UTC (rev 31680)
+++ trunk/src/wp-admin/plugins.php 2015-03-09 02:10:36 UTC (rev 31681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +321,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field('bulk-plugins') ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( $data_to_delete ? __( 'Yes, Delete these files and data' ) : __( 'Yes, Delete these files' ), 'button', 'submit', false ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <form method="post" action="<?php echo esc_url(wp_get_referer()); ?>" style="display:inline;">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $referer = wp_get_referer();
+ ?>
+ <form method="post" action="<?php echo $referer ? esc_url( $referer ) : ''; ?>" style="display:inline;">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( __( 'No, Return me to the plugin list' ), 'button', 'submit', false ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminupgradephp"></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/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/upgrade.php 2015-03-08 23:22:36 UTC (rev 31680)
+++ trunk/src/wp-admin/upgrade.php 2015-03-09 02:10:36 UTC (rev 31681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,8 +81,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $step ) :
</span><span class="cx" style="display: block; padding: 0 10px"> case 0:
</span><span class="cx" style="display: block; padding: 0 10px"> $goback = wp_get_referer();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $goback = esc_url_raw( $goback );
- $goback = urlencode( $goback );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $goback ) {
+ $goback = esc_url_raw( $goback );
+ $goback = urlencode( $goback );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Database Update Required' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to update your database to the newest version.' ); ?></p>
</span></span></pre></div>
<a id="trunksrcwpincludesclasshttpphp"></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-http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-http.php 2015-03-08 23:22:36 UTC (rev 31680)
+++ trunk/src/wp-includes/class-http.php 2015-03-09 02:10:36 UTC (rev 31681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,7 +182,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'wp_kses_bad_protocol' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $r['reject_unsafe_urls'] )
</span><span class="cx" style="display: block; padding: 0 10px"> $url = wp_http_validate_url( $url );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = wp_kses_bad_protocol( $url, array( 'http', 'https', 'ssl' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $url ) {
+ $url = wp_kses_bad_protocol( $url, array( 'http', 'https', 'ssl' ) );
+ }
</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"> $arrURL = @parse_url( $url );
</span></span></pre></div>
<a id="trunksrcwpincludesthemephp"></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/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php 2015-03-08 23:22:36 UTC (rev 31680)
+++ trunk/src/wp-includes/theme.php 2015-03-09 02:10:36 UTC (rev 31681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1050,7 +1050,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|false
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_header_image() {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1153,7 +1153,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function header_image() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo esc_url( get_header_image() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image = get_header_image();
+ if ( $image ) {
+ echo esc_url( $image );
+ }
</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>