From 27a55d645925a2926f9765bfef53247189fb54dc Mon Sep 17 00:00:00 2001 From: duck_ Date: Thu, 17 Nov 2011 20:40:24 +0000 Subject: [PATCH] Provide back compat mapping for user_level, wp_usersettings and wp_usersettingstime properties of WP_User objects. Fixes #19265. git-svn-id: http://svn.automattic.com/wordpress/trunk@19325 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/capabilities.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php index 96518586f..5a8224db8 100644 --- a/wp-includes/capabilities.php +++ b/wp-includes/capabilities.php @@ -420,11 +420,7 @@ class WP_User { */ var $filter = null; - private static $back_compat_keys = array( - 'user_firstname' => 'first_name', - 'user_lastname' => 'last_name', - 'user_description' => 'description' - ); + private static $back_compat_keys; /** * Constructor @@ -440,6 +436,18 @@ class WP_User { * @return WP_User */ function __construct( $id = 0, $name = '', $blog_id = '' ) { + if ( ! isset( self::$back_compat_keys ) ) { + $prefix = $GLOBALS['wpdb']->prefix; + self::$back_compat_keys = array( + 'user_firstname' => 'first_name', + 'user_lastname' => 'last_name', + 'user_description' => 'description', + 'user_level' => $prefix . 'user_level', + $prefix . 'usersettings' => $prefix . 'user-settings', + $prefix . 'usersettingstime' => $prefix . 'user-settings-time', + ); + } + if ( ! empty( $id ) && ! is_numeric( $id ) ) { $name = $id; $id = 0;