10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-14 04:06:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27 from champsupertramp/master

Browse Source 
i18N support and bug fixes
This commit is contained in:
Ultimate Member
2015-11-14 21:24:15 +10:00
parent 1e3dbfb534 5d6ac794f7
commit dbab64d296
5 changed files with 486 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/core/um-admin-users.php
+1 -1
View File
@@ -254,7 +254,7 @@ class UM_Admin_Users {
}
// filter by user role
if ( isset($_REQUEST['um_filter_role']) && !$_REQUEST['new_role'] && $_REQUEST['um_filter_role'] ) {
if ( isset($_REQUEST['um_filter_role']) && ! isset( $_REQUEST['new_role'] ) && $_REQUEST['um_filter_role'] ) {
exit( wp_redirect( admin_url('users.php?um_role=' . $_REQUEST['um_filter_role'] ) ) );
}
core/lib/upload/um-image-upload.php
+1 -1
View File
@@ -31,7 +31,7 @@ if(isset($_FILES[$id]['name'])) {
$ret['error'] = $error;
} else {
$file = "stream_photo_".md5($file)."_".uniqid();
$ret[] = $ultimatemember->files->new_image_upload_temp( $temp, $file, um_get_option('image_compression') );
}
core/um-actions-profile.php
+1 -1
View File
@@ -376,7 +376,7 @@
<?php if ( $ultimatemember->fields->viewing == true && um_user('description') && $args['show_bio'] ) { ?>
<div class="um-meta-text"><?php echo um_filtered_value('description'); ?></div>
<div class="um-meta-text"><?php echo wp_strip_all_tags( um_filtered_value('description') ); ?></div>
<?php } else if ( $ultimatemember->fields->editing == true && $args['show_bio'] ) { ?>
core/um-builtin.php
+480 -480
View File
File diff suppressed because it is too large Load Diff
core/um-filters-avatars.php
+3
View File
@@ -48,6 +48,9 @@
$avatar = '<img src="' . $protocol . 'gravatar.com/avatar/' . md5( um_user('user_email') ) .
'?d='. $default . '&amp;s=' . $size . $rating .'" class="gravatar avatar avatar-'.$size.' um-avatar" width="'.$size.'" height="'.$size.'" alt="" />';
}else if( empty( $avatar ) ){
$default_avatar_uri = um_get_default_avatar_uri();
$avatar = '<img src="' .$default_avatar_uri .'" class="gravatar avatar avatar-'.$size.' um-avatar" width="'.$size.'" height="'.$size.'" alt="" />';
}
return $avatar;