Changeset 14307 for trunk/wp-includes/user.php

Timestamp:

04/29/2010 07:19:21 PM (16 years ago)

Author:

ryan

Message:

When storing and retrieving meta data to user object, replace dashes with underscores to get a valid php var name.

File:

• trunk/wp-includes/user.php (modified) (2 diffs)

trunk/wp-includes/user.php

@@ -237 +237 @@
                 _deprecated_argument( __FUNCTION__, '3.0' );
 
-        if ( empty($user) )
+        if ( empty($user) ) {
                 $user = wp_get_current_user();
-        else
+                // Keys used as object vars cannot have dashes.
+                $key = str_replace('-', '_', $option);
+        } else {
                 $user = get_userdata($user);
-
-        if ( isset( $user->{$wpdb->prefix . $option} ) ) // Blog specific
-                $result = $user->{$wpdb->prefix . $option};
-        elseif ( isset( $user->{$option} ) ) // User specific and cross-blog
-                $result = $user->{$option};
+                $key = $option;
+        }
+
+        if ( isset( $user->{$wpdb->prefix . $key} ) ) // Blog specific
+                $result = $user->{$wpdb->prefix . $key};
+        elseif ( isset( $user->{$key} ) ) // User specific and cross-blog
+                $result = $user->{$key};
         else
                 $result = false;
@@ -697 +701 @@
         foreach ( $metavalues as $meta ) {
                 $value = maybe_unserialize($meta->meta_value);
-                $user->{$meta->meta_key} = $value;
+                // Keys used as object vars cannot have dashes.
+                $key = str_replace('-', '_', $meta->meta_key);
+                $user->{$key} = $value;
         }