Ticket #19617: 19617.patch

wp-admin/includes/dashboard.php

@@ -1245 +1245 @@
                  *  'img_src' - string - An image representing the browser
                  *  'img_src_ssl' - string - An image (over SSL) representing the browser
                  */
-                $response = unserialize( wp_remote_retrieve_body( $response ) );
+                $response = maybe_unserialize( wp_remote_retrieve_body( $response ) );
 
                 if ( ! $response )
                         return false;

wp-admin/includes/plugin-install.php

@@ -45 +45 @@
                 if ( is_wp_error($request) ) {
                         $res = new WP_Error('plugins_api_failed', __('An Unexpected HTTP Error occurred during the API request.'), $request->get_error_message() );
                 } else {
-                        $res = unserialize( wp_remote_retrieve_body( $request ) );
+                        $res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
                         if ( false === $res )
                                 $res = new WP_Error('plugins_api_failed', __('An unknown error occurred.'), wp_remote_retrieve_body( $request ) );
                 }

wp-admin/includes/theme.php

@@ -410 +410 @@
                 if ( is_wp_error($request) ) {
                         $res = new WP_Error('themes_api_failed', __('An Unexpected HTTP Error occurred during the API request.'), $request->get_error_message() );
                 } else {
-                        $res = unserialize( wp_remote_retrieve_body( $request ) );
+                        $res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
                         if ( ! $res )
                         $res = new WP_Error('themes_api_failed', __('An unknown error occurred.'), wp_remote_retrieve_body( $request ) );
                 }

wp-admin/includes/upgrade.php

@@ -1087 +1087 @@
                 while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
                         foreach( $rows as $row ) {
                                 $value = $row->option_value;
-                                if ( !@unserialize( $value ) )
+                                if ( !@maybe_unserialize( $value ) )
                                         $value = stripslashes( $value );
                                 if ( $value !== $row->option_value ) {
                                         update_option( $row->option_name, $value );
@@ -1239 +1239 @@
                 while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
                         foreach( $rows as $row ) {
                                 $value = $row->meta_value;
-                                if ( !@unserialize( $value ) )
+                                if ( !@maybe_unserialize( $value ) )
                                         $value = stripslashes( $value );
                                 if ( $value !== $row->meta_value ) {
                                         update_site_option( $row->meta_key, $value );
@@ -1403 +1403 @@
         if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting )
                 $option = preg_replace('|/+$|', '', $option);
 
-        @ $kellogs = unserialize($option);
+        @ $kellogs = maybe_unserialize($option);
         if ($kellogs !== FALSE)
                 return $kellogs;
         else

wp-includes/ms-functions.php

@@ -845 +845 @@
                         return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
         }
 
-        $meta = unserialize($signup->meta);
+        $meta = maybe_unserialize($signup->meta);
         $user_login = $wpdb->escape($signup->user_login);
         $user_email = $wpdb->escape($signup->user_email);
         $password = wp_generate_password( 12, false );

wp-includes/update.php

@@ -185 +185 @@
         if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) )
                 return false;
 
-        $response = unserialize( wp_remote_retrieve_body( $raw_response ) );
+        $response = maybe_unserialize( wp_remote_retrieve_body( $raw_response ) );
 
         if ( false !== $response )
                 $new_option->response = $response;
@@ -285 +285 @@
         $new_update->last_checked = time( );
         $new_update->checked = $checked;
 
-        $response = unserialize( wp_remote_retrieve_body( $raw_response ) );
+        $response = maybe_unserialize( wp_remote_retrieve_body( $raw_response ) );
         if ( false !== $response )
                 $new_update->response = $response;
 

wp-includes/user.php

@@ -883 +883 @@
                 $users_of_blog = $wpdb->get_col( "SELECT meta_value FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities'" );
 
                 foreach ( $users_of_blog as $caps_meta ) {
-                        $b_roles = unserialize($caps_meta);
+                        $b_roles = maybe_unserialize($caps_meta);
                         if ( is_array($b_roles) ) {
                                 foreach ( $b_roles as $b_role => $val ) {
                                         if ( isset($avail_roles[$b_role]) ) {