Changeset 16377

Timestamp:

11/15/2010 06:38:10 AM (14 years ago)

Author:

nacin

Message:

Properly check, initialize, or cast a number of variables. props ChenHui. see #14642.

Location:

trunk

Files:

• wp-admin/edit.php (modified) (1 diff)
• wp-admin/includes/image-edit.php (modified) (2 diffs)
• wp-admin/includes/user.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/edit.php

@@ -14 +14 @@
 
 // Back-compat for viewing comments of an entry
-if ( $_redirect = intval( max( @$_REQUEST['p'], @$_REQUEST['attachment_id'], @$_REQUEST['page_id'] ) ) ) {
-    wp_redirect( admin_url('edit-comments.php?p=' . $_redirect ) );
-    exit;
-} else {
-    unset( $_redirect );
-}
+foreach ( array( 'p', 'attachment_id', 'page_id' ) as $_redirect ) {
+    if ( ! empty( $_REQUEST[ $_redirect ] ) ) {
+        wp_redirect( admin_url( 'edit-comments.php?p=' . absint( $_REQUEST[ $_redirect ] ) ) );
+        exit;
+    }
+}
+unset( $_redirect );
 
 // Handle bulk actions

trunk/wp-admin/includes/image-edit.php

@@ -423 +423 @@
     $backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
     $restored = false;
-    $msg = '';
+    $msg = new stdClass;
 
     if ( !is_array($backup_sizes) ) {
@@ -494 +494 @@
 
 function wp_save_image($post_id) {
-    $return = '';
+    $return = new stdClass;
     $success = $delete = $scaled = $nocrop = false;
     $post = get_post($post_id);

trunk/wp-admin/includes/user.php

@@ -56 +56 @@
 function edit_user( $user_id = 0 ) {
     global $wp_roles, $wpdb;
-    if ( $user_id != 0 ) {
+    $user = new WP_User( $user_id );
+    if ( $user_id ) {
         $update = true;
         $user->ID = (int) $user_id;
@@ -63 +64 @@
     } else {
         $update = false;
-        $user = '';
     }
 

trunk/wp-includes/functions.php

@@ -4233 +4233 @@
             $extra_headers[$key] = $key;
         }
-        $all_headers = array_merge($extra_headers, $default_headers);
+        $all_headers = array_merge( $extra_headers, (array) $default_headers );
     } else {
         $all_headers = $default_headers;