Changeset 20612

Timestamp:

04/27/2012 03:57:51 PM (13 years ago)

Author:

nacin

Message:

Use maybe_serialize() where appropriate. fixes #19617.

Location:

trunk

Files:

• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (1 diff)
• wp-includes/user.php (modified) (1 diff)

trunk/wp-admin/includes/dashboard.php

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

trunk/wp-includes/ms-functions.php

@@ -844 +844 @@
     }
 
-    $meta = unserialize($signup->meta);
+    $meta = maybe_unserialize($signup->meta);
     $user_login = $wpdb->escape($signup->user_login);
     $user_email = $wpdb->escape($signup->user_email);

trunk/wp-includes/user.php

@@ -886 +886 @@
 
         foreach ( $users_of_blog as $caps_meta ) {
-            $b_roles = unserialize($caps_meta);
-            if ( is_array($b_roles) ) {
-                foreach ( $b_roles as $b_role => $val ) {
-                    if ( isset($avail_roles[$b_role]) ) {
-                        $avail_roles[$b_role]++;
-                    } else {
-                        $avail_roles[$b_role] = 1;
-                    }
+            $b_roles = maybe_unserialize($caps_meta);
+            if ( ! is_array( $b_roles ) )
+                continue;
+            foreach ( $b_roles as $b_role => $val ) {
+                if ( isset($avail_roles[$b_role]) ) {
+                    $avail_roles[$b_role]++;
+                } else {
+                    $avail_roles[$b_role] = 1;
                 }
             }