mirror of
https://github.com/10h30/ultimatemember.git
synced 2026-07-11 18:56:10 +09:00
Merge branch 'master' into development/2.6.2
This commit is contained in:
Mykyta Synelnikov
@@ -2393,8 +2393,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
|
||||
}
|
||||
|
||||
$field_name = $key . $form_suffix;
|
||||
$field_value = htmlspecialchars( $this->field_value( $key, $default, $data ) );
|
||||
$field_name = $key . $form_suffix;
|
||||
$field_value = $this->field_value( $key, $default, $data );
|
||||
$field_value = ! is_null( $field_value ) ? htmlspecialchars( $field_value ) : null;
|
||||
|
||||
$output .= '<input ' . $disabled . ' class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
|
||||
|
||||
@@ -2444,7 +2445,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
|
||||
if ( $this->is_error( $key ) ) {
|
||||
$output .= $this->field_error( $this->show_error( $key ) );
|
||||
}else if ( $this->is_notice( $key ) ) {
|
||||
} elseif ( $this->is_notice( $key ) ) {
|
||||
$output .= $this->field_notice( $this->show_notice( $key ) );
|
||||
}
|
||||
|
||||
@@ -2468,8 +2469,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
|
||||
}
|
||||
|
||||
$field_name = $key . $form_suffix;
|
||||
$field_value = htmlspecialchars( $this->field_value( $key, $default, $data ) );
|
||||
$field_name = $key . $form_suffix;
|
||||
$field_value = $this->field_value( $key, $default, $data );
|
||||
$field_value = ! is_null( $field_value ) ? htmlspecialchars( $field_value ) : null;
|
||||
|
||||
$output .= '<input ' . $disabled . ' autocomplete="' . esc_attr( $autocomplete ) . '" class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
|
||||
|
||||
@@ -2513,7 +2515,10 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
$number_limit .= ' max="' . esc_attr( $max ) . '" ';
|
||||
}
|
||||
|
||||
$output .= '<input ' . $disabled . ' class="' . $this->get_class( $key, $data ) . '" type="number" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . UM()->form()->form_suffix ) . '" value="' . esc_attr( htmlspecialchars( $this->field_value( $key, $default, $data ) ) ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" ' . $number_limit . ' />
|
||||
$field_value = $this->field_value( $key, $default, $data );
|
||||
$field_value = ! is_null( $field_value ) ? htmlspecialchars( $field_value ) : null;
|
||||
|
||||
$output .= '<input ' . $disabled . ' class="' . $this->get_class( $key, $data ) . '" type="number" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" ' . $number_limit . ' />
|
||||
|
||||
</div>';
|
||||
|
||||
@@ -2549,7 +2554,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
|
||||
}
|
||||
|
||||
$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . UM()->form()->form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
|
||||
$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
|
||||
|
||||
</div>';
|
||||
|
||||
@@ -2581,7 +2586,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
|
||||
}
|
||||
|
||||
$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . UM()->form()->form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
|
||||
$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
|
||||
|
||||
</div>';
|
||||
|
||||
@@ -2622,7 +2627,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
$name = $key;
|
||||
}
|
||||
|
||||
$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $name ) . '" id="' . esc_attr( $key . UM()->form()->form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
|
||||
$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $name ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
|
||||
|
||||
</div>';
|
||||
|
||||
@@ -2669,7 +2674,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
}
|
||||
|
||||
|
||||
$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $name ) . '" id="' . esc_attr( $key . UM()->form()->form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />';
|
||||
$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $name ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />';
|
||||
|
||||
|
||||
$output .= '</div>';
|
||||
@@ -2705,7 +2710,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
|
||||
}
|
||||
|
||||
$output .= '<input ' . $disabled . ' class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . UM()->form()->form_suffix ) . '" value="' . esc_attr( $this->field_value( $key, $default, $data ) ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
|
||||
$output .= '<input ' . $disabled . ' class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . esc_attr( $this->field_value( $key, $default, $data ) ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
|
||||
|
||||
</div>';
|
||||
|
||||
@@ -2748,7 +2753,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
$value = date( 'Y/m/d', $unixtimestamp );
|
||||
}
|
||||
|
||||
$output .= '<input ' . $disabled . ' class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . UM()->form()->form_suffix ) . '" value="' . esc_attr( $value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" data-range="' . esc_attr( $range ) . '" data-years="' . esc_attr( $years ) . '" data-years_x="' . esc_attr( $years_x ) . '" data-disabled_weekdays="' . esc_attr( $disabled_weekdays ) . '" data-date_min="' . esc_attr( $date_min ) . '" data-date_max="' . esc_attr( $date_max ) . '" data-format="' . esc_attr( $js_format ) . '" data-value="' . esc_attr( $value ) . '" />
|
||||
$output .= '<input ' . $disabled . ' class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . esc_attr( $value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" data-range="' . esc_attr( $range ) . '" data-years="' . esc_attr( $years ) . '" data-years_x="' . esc_attr( $years_x ) . '" data-disabled_weekdays="' . esc_attr( $disabled_weekdays ) . '" data-date_min="' . esc_attr( $date_min ) . '" data-date_max="' . esc_attr( $date_max ) . '" data-format="' . esc_attr( $js_format ) . '" data-value="' . esc_attr( $value ) . '" />
|
||||
|
||||
</div>';
|
||||
|
||||
@@ -2778,7 +2783,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
|
||||
}
|
||||
|
||||
$output .= '<input ' . $disabled . ' class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . UM()->form()->form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" data-format="' . esc_attr( $js_format ) . '" data-intervals="' . esc_attr( $intervals ) . '" data-value="' . $this->field_value( $key, $default, $data ) . '" />
|
||||
$output .= '<input ' . $disabled . ' class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" data-format="' . esc_attr( $js_format ) . '" data-intervals="' . esc_attr( $intervals ) . '" data-value="' . $this->field_value( $key, $default, $data ) . '" />
|
||||
|
||||
</div>';
|
||||
|
||||
@@ -2919,7 +2924,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
} else {
|
||||
$field_value = $this->field_value( $key, $default, $data );
|
||||
}
|
||||
$output .= '<input type="hidden" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . UM()->form()->form_suffix ) . '" value="' . $field_value . '" />';
|
||||
$output .= '<input type="hidden" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $field_value . '" />';
|
||||
if ( isset( $data['label'] ) ) {
|
||||
$output .= $this->field_label( $label, $key, $data );
|
||||
}
|
||||
@@ -3004,7 +3009,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
/* Single File Upload */
|
||||
case 'file':
|
||||
$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . ' data-mode="' . esc_attr( $this->set_mode ) . '" data-upload-label="' . ( ! empty( $data['button_text'] ) ? esc_attr( $data['button_text'] ) : esc_attr__( 'Upload', 'ultimate-member' ) ) . '">';
|
||||
$output .= '<input type="hidden" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . UM()->form()->form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" />';
|
||||
$output .= '<input type="hidden" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" />';
|
||||
if ( isset( $data['label'] ) ) {
|
||||
$output .= $this->field_label( $label, $key, $data );
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ msgstr ""
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"POT-Creation-Date: 2023-05-23T13:39:22+00:00\n"
|
||||
"POT-Creation-Date: 2023-05-23T14:48:48+00:00\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"X-Generator: WP-CLI 2.7.1\n"
|
||||
"X-Domain: ultimate-member\n"
|
||||
@@ -122,7 +122,7 @@ msgstr ""
|
||||
#: includes/admin/core/class-admin-builder.php:778
|
||||
#: includes/admin/core/class-admin-dragdrop.php:33
|
||||
#: includes/admin/core/class-admin-menu.php:106
|
||||
#: includes/core/class-fields.php:4957
|
||||
#: includes/core/class-fields.php:4962
|
||||
msgid "Please login as administrator"
|
||||
msgstr ""
|
||||
|
||||
@@ -1350,8 +1350,8 @@ msgstr ""
|
||||
#: includes/admin/core/class-admin-metabox.php:2037
|
||||
#: includes/core/class-fields.php:1940
|
||||
#: includes/core/class-fields.php:1981
|
||||
#: includes/core/class-fields.php:2916
|
||||
#: includes/core/class-fields.php:3006
|
||||
#: includes/core/class-fields.php:2921
|
||||
#: includes/core/class-fields.php:3011
|
||||
msgid "Upload"
|
||||
msgstr ""
|
||||
|
||||
@@ -3174,7 +3174,7 @@ msgid "UM Action"
|
||||
msgstr ""
|
||||
|
||||
#: includes/admin/core/class-admin-users.php:194
|
||||
#: includes/core/class-fields.php:2986
|
||||
#: includes/core/class-fields.php:2991
|
||||
msgid "Apply"
|
||||
msgstr ""
|
||||
|
||||
@@ -4388,8 +4388,8 @@ msgstr ""
|
||||
#: includes/admin/templates/modal/forms/fonticons.php:14
|
||||
#: includes/admin/templates/role/publish.php:30
|
||||
#: includes/class-config.php:246
|
||||
#: includes/core/class-fields.php:2987
|
||||
#: includes/core/class-fields.php:3094
|
||||
#: includes/core/class-fields.php:2992
|
||||
#: includes/core/class-fields.php:3099
|
||||
#: includes/core/um-actions-profile.php:897
|
||||
#: includes/core/um-actions-profile.php:909
|
||||
#: includes/core/um-actions-profile.php:1097
|
||||
@@ -7262,57 +7262,57 @@ msgstr ""
|
||||
msgid "You can only upload one file"
|
||||
msgstr ""
|
||||
|
||||
#: includes/core/class-fields.php:2573
|
||||
#: includes/core/class-fields.php:2578
|
||||
msgid "Current Password"
|
||||
msgstr ""
|
||||
|
||||
#: includes/core/class-fields.php:2604
|
||||
#: includes/core/class-fields.php:2609
|
||||
msgid "New Password"
|
||||
msgstr ""
|
||||
|
||||
#: includes/core/class-fields.php:2647
|
||||
#: includes/core/class-fields.php:2666
|
||||
#: includes/core/class-fields.php:2668
|
||||
#: includes/core/class-fields.php:2652
|
||||
#: includes/core/class-fields.php:2671
|
||||
#: includes/core/class-fields.php:2673
|
||||
msgid "Confirm %s"
|
||||
msgstr ""
|
||||
|
||||
#: includes/core/class-fields.php:2926
|
||||
#: includes/core/class-fields.php:2931
|
||||
msgid "Upload Photo"
|
||||
msgstr ""
|
||||
|
||||
#: includes/core/class-fields.php:2953
|
||||
#: includes/core/class-fields.php:2986
|
||||
#: includes/core/class-fields.php:2958
|
||||
#: includes/core/class-fields.php:2991
|
||||
#: includes/core/um-actions-profile.php:1128
|
||||
msgid "Change photo"
|
||||
msgstr ""
|
||||
|
||||
#: includes/core/class-fields.php:2986
|
||||
#: includes/core/class-fields.php:3093
|
||||
#: includes/core/class-fields.php:2991
|
||||
#: includes/core/class-fields.php:3098
|
||||
msgid "Processing..."
|
||||
msgstr ""
|
||||
|
||||
#: includes/core/class-fields.php:3011
|
||||
#: includes/core/class-fields.php:3016
|
||||
msgid "Upload File"
|
||||
msgstr ""
|
||||
|
||||
#: includes/core/class-fields.php:3055
|
||||
#: includes/core/class-fields.php:3060
|
||||
#: includes/core/um-filters-fields.php:330
|
||||
msgid "This file has been removed."
|
||||
msgstr ""
|
||||
|
||||
#: includes/core/class-fields.php:3059
|
||||
#: includes/core/class-fields.php:3064
|
||||
msgid "Change file"
|
||||
msgstr ""
|
||||
|
||||
#: includes/core/class-fields.php:3093
|
||||
#: includes/core/class-fields.php:3098
|
||||
msgid "Save"
|
||||
msgstr ""
|
||||
|
||||
#: includes/core/class-fields.php:4686
|
||||
#: includes/core/class-fields.php:4691
|
||||
msgid "Your profile is looking a little empty. Why not <a href=\"%s\">add</a> some information!"
|
||||
msgstr ""
|
||||
|
||||
#: includes/core/class-fields.php:4688
|
||||
#: includes/core/class-fields.php:4693
|
||||
msgid "This user has not added any information to their profile yet."
|
||||
msgstr ""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user