← All changes | widgets/user-meta.php +12 -15 trunk → 1.2.11 View file →

		@@ -94,9 +94,9 @@
94	94	$keys = array();
95	95	$keys[] = __('Select Key','userswp');
96	96	if(!empty($fields)){
97	97	foreach($fields as $field){
98		- $keys[ $field->htmlvar_name ] = $field->htmlvar_name . ' ( ' . __( stripslashes( $field->site_title ), 'userswp' ) . ' )';
	98	+ $keys[ $field->htmlvar_name ] = $field->htmlvar_name . ' ( ' . __( $field->site_title, 'userswp' ) . ' )';
99	99	}
100	100	}
101	101
102	102	return apply_filters( 'uwp_meta_field_keys', $keys );
		@@ -112,10 +112,10 @@
112	112	*
113	113	* @return mixed|string|bool
114	114	*/
115	115	public function output( $args = array(), $widget_args = array(), $content = '' ) {
	116	+
116	117	global $wpdb, $post;
117		-
118	118	$table_name = uwp_get_table_prefix() . 'uwp_form_fields';
119	119
120	120	$defaults = array(
121	121	'user_id' => '',
		@@ -126,23 +126,20 @@
126	126
127	127	$args = wp_parse_args( $args, $defaults );
128	128
129	129	$args = apply_filters( 'uwp_widget_user_meta_args', $args, $widget_args, $this );
130		- $user = array();
131	130
132		- if ( ! empty( $args['user_id'] ) ) {
133		- if ( 'post_author' == $args['user_id'] ) {
134		- if ( ! empty( $post ) && is_object( $post ) && ! empty( $post->post_author ) ) {
135		- $user = get_userdata( (int) $post->post_author );
136		- }
137		- } else {
138		- $user = get_userdata( (int) $args['user_id'] );
139		- }
	131	+ if(isset($args['user_id']) && !empty($args['user_id'])){
	132	+ if('post_author' == $args['user_id'] && $post instanceof WP_Post){
	133	+ $user = get_userdata($post->post_author);
	134	+ } else {
	135	+ $user = get_userdata((int)$args['user_id']);
	136	+ }
140	137	} else {
141		- $user = uwp_get_displayed_user();
	138	+ $user = uwp_get_displayed_user();
142	139	}
143	140
144		- if ( empty( $args['key'] ) || empty( $user ) ) {
	141	+ if(empty($args['key']) || empty($user)){
145	142	return '';
146	143	}
147	144
148	145	$key = str_replace('uwp_account_', '', $args['key']);
		@@ -190,9 +187,9 @@
190	187	case 'icon-value':
191	188	$output = $icon.$value;
192	189	break;
193	190	case 'label-value':
194		- $output = '<div class="uwp-user-meta-key">'. __( stripslashes( $field->site_title ), 'userswp' ) . '<span class="uwp-profile-extra-sep">:</span></div><div class="uwp-user-meta-value">'.$value.'</div>';
	191	+ $output = '<div class="uwp-user-meta-key">'. $field->site_title . '<span class="uwp-profile-extra-sep">:</span></div><div class="uwp-user-meta-value">'.$value.'</div>';
195	192	break;
196	193	case 'label':
197	194	return $field->site_title;
198	195	break;
		@@ -202,9 +199,9 @@
202	199	case 'value-strip':
203	200	$output = '<div class="uwp-user-meta-value">'.strip_tags($value).'</div>';
204	201	break;
205	202	default:
206		- $output = '<div class="uwp-user-meta-key">'. $icon . __( stripslashes( $field->site_title ), 'userswp' ) . '<span class="uwp-profile-extra-sep">:</span></div><div class="uwp-user-meta-value">'. $value. '</div>';
	203	+ $output = '<div class="uwp-user-meta-key">'. $icon . $field->site_title . '<span class="uwp-profile-extra-sep">:</span></div><div class="uwp-user-meta-value">'. $value. '</div>';
207	204	}
208	205
209	206	//wrap output in a div
210	207	$output = '<div class="uwp-user-meta-wrap '.$css_class.'">'.$output.'</div>';