Ticket #14642: support_hphp.diff

wp-admin/edit.php

@@ -15 +15 @@
 $table->check_permissions();
 
 // Back-compat for viewing comments of an entry
-if ( $_redirect = intval( max( @$_REQUEST['p'], @$_REQUEST['attachment_id'], @$_REQUEST['page_id'] ) ) ) {
+if ( isset($_GET['p']) && isset($_GET['attachment_id']) && isset($_GET['page_id']) && $_redirect = intval( max( @$_REQUEST['p'], @$_REQUEST['attachment_id'], @$_REQUEST['page_id'] ) ) ) {
         wp_redirect( admin_url('edit-comments.php?p=' . $_redirect ) );
         exit;
 } else {

wp-admin/includes/image-edit.php

@@ -421 +421 @@
         $file = get_attached_file($post_id);
         $backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
         $restored = false;
-        $msg = '';
 
         if ( !is_array($backup_sizes) ) {
                 $msg->error = __('Cannot load image metadata.');
@@ -492 +491 @@
 }
 
 function wp_save_image($post_id) {
-        $return = '';
         $success = $delete = $scaled = $nocrop = false;
         $post = get_post($post_id);
         @ini_set('memory_limit', '256M');

wp-admin/includes/user.php

@@ -55 +55 @@
  */
 function edit_user( $user_id = 0 ) {
         global $wp_roles, $wpdb;
+        $user = new WP_User($user_id);
         if ( $user_id != 0 ) {
                 $update = true;
                 $user->ID = (int) $user_id;
@@ -62 +63 @@
                 $user->user_login = $wpdb->escape( $userdata->user_login );
         } else {
                 $update = false;
-                $user = '';
         }
 
         if ( !$update && isset( $_POST['user_login'] ) )

wp-includes/functions.php

@@ -1410 +1410 @@
         $qs = urlencode_deep( $qs ); // this re-URL-encodes things that were already in the query string
         if ( is_array( func_get_arg( 0 ) ) ) {
                 $kayvees = func_get_arg( 0 );
-                $qs = array_merge( $qs, $kayvees );
+                $qs = array_merge( (array)$qs, (array)$kayvees );
         } else {
                 $qs[func_get_arg( 0 )] = func_get_arg( 1 );
         }
@@ -2960 +2960 @@
                 wp_parse_str( $args, $r );
 
         if ( is_array( $defaults ) )
-                return array_merge( $defaults, $r );
+                return array_merge( $defaults, (array)$r );
         return $r;
 }
 
@@ -4179 +4179 @@
                 foreach( $extra_headers as $key=>$value ) {
                         $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;
         }

wp-includes/registration.php

@@ -103 +103 @@
 function wp_insert_user($userdata) {
         global $wpdb;
 
-        extract($userdata, EXTR_SKIP);
+        extract($userdata);
 
         // Are we updating or creating?
         if ( !empty($ID) ) {