Changeset 31681

Timestamp:

03/09/2015 02:10:36 AM (10 years ago)

Author:

wonderboymusic

Message:

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 #30799.

Location:

trunk/src

Files:

• wp-admin/edit-form-advanced.php (modified) (2 diffs)
• wp-admin/edit-form-comment.php (modified) (2 diffs)
• wp-admin/includes/class-wp-comments-list-table.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-admin/network/themes.php (modified) (1 diff)
• wp-admin/plugins.php (modified) (1 diff)
• wp-admin/upgrade.php (modified) (1 diff)
• wp-includes/class-http.php (modified) (1 diff)
• wp-includes/theme.php (modified) (2 diffs)

trunk/src/wp-admin/edit-form-advanced.php

@@ -427 +427 @@
  */
 do_action( 'post_edit_form_tag', $post );
+
+$referer = wp_get_referer();
 ?>>
 <?php wp_nonce_field($nonce_action); ?>
@@ -435 +437 @@
 <input type="hidden" id="post_type" name="post_type" value="<?php echo esc_attr( $post_type ) ?>" />
 <input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo esc_attr( $post->post_status) ?>" />
-<input type="hidden" id="referredby" name="referredby" value="<?php echo esc_url(wp_get_referer()); ?>" />
+<input type="hidden" id="referredby" name="referredby" value="<?php echo $referer ? esc_url( $referer ) : ''; ?>" />
 <?php if ( ! empty( $active_post_lock ) ) { ?>
 <input type="hidden" id="active_post_lock" value="<?php echo esc_attr( implode( ':', $active_post_lock ) ); ?>" />

trunk/src/wp-admin/edit-form-comment.php

@@ -169 +169 @@
 do_meta_boxes(null, 'normal', $comment);
 
+$referer = wp_get_referer();
 ?>
 </div>
@@ -174 +175 @@
 <input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID) ?>" />
 <input type="hidden" name="p" value="<?php echo esc_attr($comment->comment_post_ID) ?>" />
-<input name="referredby" type="hidden" id="referredby" value="<?php echo esc_url( wp_get_referer() ); ?>" />
+<input name="referredby" type="hidden" id="referredby" value="<?php echo $referer ? esc_url( $referer ) : ''; ?>" />
 <?php wp_original_referer_field(true, 'previous'); ?>
 <input type="hidden" name="noredir" value="1" />

trunk/src/wp-admin/includes/class-wp-comments-list-table.php

@@ -362 +362 @@
         $comment = $a_comment;
         $the_comment_class = wp_get_comment_status( $comment->comment_ID );
+        if ( ! $the_comment_class ) {
+            $the_comment_class = '';
+        }
         $the_comment_class = join( ' ', get_comment_class( $the_comment_class, $comment->comment_ID, $comment->comment_post_ID ) );
 

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

@@ -1221 +1221 @@
     if ( $ptype->hierarchical ) {
         $uri = get_page_uri($post);
-        $uri = untrailingslashit($uri);
-        $uri = strrev( stristr( strrev( $uri ), '/' ) );
-        $uri = untrailingslashit($uri);
+        if ( $uri ) {
+            $uri = untrailingslashit($uri);
+            $uri = strrev( stristr( strrev( $uri ), '/' ) );
+            $uri = untrailingslashit($uri);
+        }
 
         /** This filter is documented in wp-admin/edit-tag-form.php */

trunk/src/wp-admin/network/themes.php

@@ -175 +175 @@
                     <?php submit_button( _n( 'Yes, Delete this theme', 'Yes, Delete these themes', $themes_to_delete ), 'button', 'submit', false ); ?>
                 </form>
-                <form method="post" action="<?php echo esc_url(wp_get_referer()); ?>" style="display:inline;">
+                <?php
+                $referer = wp_get_referer();
+                ?>
+                <form method="post" action="<?php echo $referer ? esc_url( $referer ) : ''; ?>" style="display:inline;">
                     <?php submit_button( __( 'No, Return me to the theme list' ), 'button', 'submit', false ); ?>
                 </form>

trunk/src/wp-admin/plugins.php

@@ -322 +322 @@
                     <?php submit_button( $data_to_delete ? __( 'Yes, Delete these files and data' ) : __( 'Yes, Delete these files' ), 'button', 'submit', false ); ?>
                 </form>
-                <form method="post" action="<?php echo esc_url(wp_get_referer()); ?>" style="display:inline;">
+                <?php
+                $referer = wp_get_referer();
+                ?>
+                <form method="post" action="<?php echo $referer ? esc_url( $referer ) : ''; ?>" style="display:inline;">
                     <?php submit_button( __( 'No, Return me to the plugin list' ), 'button', 'submit', false ); ?>
                 </form>

trunk/src/wp-admin/upgrade.php

@@ -82 +82 @@
     case 0:
         $goback = wp_get_referer();
-        $goback = esc_url_raw( $goback );
-        $goback = urlencode( $goback );
+        if ( $goback ) {
+            $goback = esc_url_raw( $goback );
+            $goback = urlencode( $goback );
+        }
 ?>
 <h2><?php _e( 'Database Update Required' ); ?></h2>

trunk/src/wp-includes/class-http.php

@@ -183 +183 @@
             if ( $r['reject_unsafe_urls'] )
                 $url = wp_http_validate_url( $url );
-            $url = wp_kses_bad_protocol( $url, array( 'http', 'https', 'ssl' ) );
+            if ( $url ) {
+                $url = wp_kses_bad_protocol( $url, array( 'http', 'https', 'ssl' ) );
+            }
         }
 

trunk/src/wp-includes/theme.php

@@ -1051 +1051 @@
  * @since 2.1.0
  *
- * @return string
+ * @return string|false
  */
 function get_header_image() {
@@ -1154 +1154 @@
  */
 function header_image() {
-    echo esc_url( get_header_image() );
+    $image = get_header_image();
+    if ( $image ) {
+        echo esc_url( $image );
+    }
 }