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

- fixed upgrade script;

Browse Source
This commit is contained in:
nikitasinelnikov
2020-01-15 13:03:43 +02:00
parent 455287f05c
commit e66af65b08
3 changed files with 768 additions and 757 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/packages/2.1.3-beta3/functions.php
+6 -8
View File
@@ -6,11 +6,9 @@ function um_upgrade_users_count213beta3() {
um_maybe_unset_time_limit();
$users = get_users( array(
'number' => '',
'fields' => 'ids'
) );
$count = count( $users );
global $wpdb;
$count = $wpdb->get_var( "SELECT COUNT(*) FROM {$wpdb->users}" );
wp_send_json_success( array( 'count' => $count ) );
}
@@ -34,7 +32,7 @@ function um_upgrade_metadata_per_user213beta3() {
"SELECT MIN(ID) AS MinID, MAX(ID) AS MaxID
FROM (
SELECT u.ID
FROM wpbultimate_users as u
FROM {$wpdb->users} as u
ORDER BY u.ID
LIMIT %d, %d
) as dt",
@@ -46,8 +44,8 @@ function um_upgrade_metadata_per_user213beta3() {
"SELECT u.ID as user_id,
um.meta_key as meta_key,
um.meta_value as meta_value
FROM wpbultimate_users u
LEFT JOIN wpbultimate_usermeta um ON ( um.user_id = u.ID AND um.meta_key IN( 'account_status','hide_in_members','synced_gravatar_hashed_id','synced_profile_photo','profile_photo','cover_photo','_um_verified' ) )
FROM {$wpdb->users} u
LEFT JOIN {$wpdb->usermeta} um ON ( um.user_id = u.ID AND um.meta_key IN( 'account_status','hide_in_members','synced_gravatar_hashed_id','synced_profile_photo','profile_photo','cover_photo','_um_verified' ) )
WHERE u.ID >= %d AND
u.ID <= %d",
$min_max['MinID'],
includes/core/class-fields.php
+11 -12
View File
@@ -2512,7 +2512,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
}
$modal_label = ( isset( $data['label'] ) ) ? $data['label'] : __( 'Upload Photo', 'ultimate-member' );
$output .= '<div class="um-field-area" style="text-align: center;">';
if ( $field_value ) {
if ( ! empty( $field_value ) && $field_value != 'empty_file' ) {
if ( ! in_array( $key, array( 'profile_photo', 'cover_photo' ) ) ) {
if ( isset( $this->set_mode ) && 'register' == $this->set_mode ) {
$image_info = get_transient("um_{$field_value}");
@@ -2520,7 +2521,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$image_info = um_user( $data['metakey']."_metadata" );
}
if ( isset( $this->set_mode ) && $this->set_mode == 'register' ) {
if ( ( isset( $this->set_mode ) && $this->set_mode == 'register' ) || file_exists( UM()->uploader()->get_core_temp_dir() . DIRECTORY_SEPARATOR . $field_value ) ) {
$imgValue = UM()->uploader()->get_core_temp_url() . "/" . $this->field_value( $key, $default, $data );
} else {
$imgValue = UM()->files()->get_download_link( $this->set_id, $key, um_user( 'ID' ) );
@@ -2563,7 +2564,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$output .= '</div>';
$output .= '</div>';
/* end */
if ($this->is_error( $key )) {
if ( $this->is_error( $key ) ) {
$output .= $this->field_error( $this->show_error( $key ) );
}
$output .= '</div>';
@@ -2594,19 +2595,17 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$file_field_name = $file_info['original_name'];
}
if ( isset( $this->set_mode ) && 'register' == $this->set_mode ) {
$file_url = UM()->uploader()->get_core_temp_url() . DIRECTORY_SEPARATOR . $this->field_value( $key, $default, $data );
$file_dir = UM()->uploader()->get_core_temp_dir() . DIRECTORY_SEPARATOR . $this->field_value( $key, $default, $data );
if ( ( isset( $this->set_mode ) && 'register' == $this->set_mode ) || file_exists( UM()->uploader()->get_core_temp_dir() . DIRECTORY_SEPARATOR . $file_field_value ) ) {
$file_url = UM()->uploader()->get_core_temp_url() . DIRECTORY_SEPARATOR . $file_field_value;
$file_dir = UM()->uploader()->get_core_temp_dir() . DIRECTORY_SEPARATOR . $file_field_value;
} else {
$file_url = UM()->files()->get_download_link( $this->set_id, $key, um_user( 'ID' ) );
$file_dir = UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . $this->field_value( $key, $default, $data );
}
if ( ! file_exists( $file_dir ) ) {
if ( is_multisite() ) {
//multisite fix for old customers
$file_dir = str_replace( DIRECTORY_SEPARATOR . 'sites' . DIRECTORY_SEPARATOR . get_current_blog_id() . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $file_dir );
}
}
//multisite fix for old customers
if ( ! file_exists( $file_dir ) && is_multisite() ) {
$file_dir = str_replace( DIRECTORY_SEPARATOR . 'sites' . DIRECTORY_SEPARATOR . get_current_blog_id() . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $file_dir );
}
if ( file_exists( $file_dir ) ) {
languages/ultimate-member-en_US.po
+751 -737
View File
File diff suppressed because it is too large Load Diff