Skip to content

Commit 52195c8

Browse files
committed
Deploying version 6.4.3
1 parent 1717327 commit 52195c8

File tree

160 files changed

+3550
-1612
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+3550
-1612
lines changed

acf.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Plugin Name: Advanced Custom Fields
1010
* Plugin URI: https://www.advancedcustomfields.com
1111
* Description: Customize WordPress with powerful, professional and intuitive fields.
12-
* Version: 6.4.2
12+
* Version: 6.4.3
1313
* Author: WP Engine
1414
* Author URI: https://wpengine.com/?utm_source=wordpress.org&utm_medium=referral&utm_campaign=plugin_directory&utm_content=advanced_custom_fields
1515
* Update URI: https://www.advancedcustomfields.com
@@ -36,7 +36,7 @@ class ACF {
3636
*
3737
* @var string
3838
*/
39-
public $version = '6.4.2';
39+
public $version = '6.4.3';
4040

4141
/**
4242
* The plugin settings array.

assets/build/js/acf-escaped-html-notice.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/build/js/acf-field-group.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/build/js/acf-input.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/build/js/acf-internal-post-type.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/build/js/acf.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

composer.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,13 @@
1414
}
1515
],
1616
"config": {
17-
"optimize-autoloader": true
17+
"optimize-autoloader": true,
18+
"classmap-authoritative": true
19+
},
20+
"scripts": {
21+
"post-autoload-dump": [
22+
"sed -i '' \"/InstalledVersions.php/d\" vendor/composer/autoload_static.php"
23+
]
1824
},
1925
"require": {}
2026
}

includes/Updater/Updater.php

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,21 @@ public function request( $endpoint = '', $body = null ) {
142142
acf_log( $url, $body );
143143
}
144144

145+
// If we're posting an ACF license key, set it as the header.
146+
if ( is_array( $body ) && isset( $body['acf_license'] ) ) {
147+
$headers['X-ACF-License'] = $body['acf_license'];
148+
}
149+
145150
// Determine URL.
146151
if ( acf_is_pro() ) {
147-
$license_key = acf_pro_get_license_key();
148-
if ( empty( $license_key ) || ! is_string( $license_key ) ) {
149-
$license_key = '';
152+
if ( empty( $headers['X-ACF-License'] ) ) {
153+
$license_key = acf_pro_get_license_key();
154+
if ( empty( $license_key ) || ! is_string( $license_key ) ) {
155+
$license_key = '';
156+
}
157+
$headers['X-ACF-License'] = $license_key;
150158
}
151-
$headers['X-ACF-License'] = $license_key;
152-
$headers['X-ACF-Plugin'] = 'pro';
159+
$headers['X-ACF-Plugin'] = 'pro';
153160
} else {
154161
$headers['X-ACF-Plugin'] = 'acf';
155162
}

includes/acf-field-functions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ function acf_render_field_label( $field ) {
847847
function acf_get_field_label( $field, $context = '' ) {
848848

849849
// Get label.
850-
$label = $field['label'];
850+
$label = esc_html( $field['label'] );
851851

852852
// Display empty text when editing field.
853853
if ( $context == 'admin' && $label === '' ) {

includes/admin/admin-internal-post-type-list.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -549,8 +549,8 @@ public function check_activate() {
549549
foreach ( $activated as $activated_id ) {
550550
$links[] = sprintf(
551551
'<a href="%1$s">%2$s</a>',
552-
get_edit_post_link( $activated_id ),
553-
get_the_title( $activated_id )
552+
esc_url( get_edit_post_link( $activated_id ) ),
553+
esc_html( get_the_title( $activated_id ) )
554554
);
555555
}
556556

@@ -619,8 +619,8 @@ public function check_deactivate() {
619619
foreach ( $deactivated as $deactivated_id ) {
620620
$links[] = sprintf(
621621
'<a href="%1$s">%2$s</a>',
622-
get_edit_post_link( $deactivated_id ),
623-
get_the_title( $deactivated_id )
622+
esc_url( get_edit_post_link( $deactivated_id ) ),
623+
esc_html( get_the_title( $deactivated_id ) )
624624
);
625625
}
626626

@@ -688,8 +688,8 @@ public function check_duplicate() {
688688
foreach ( $duplicated as $duplicated_id ) {
689689
$links[] = sprintf(
690690
'<a href="%1$s">%2$s</a>',
691-
get_edit_post_link( $duplicated_id ),
692-
get_the_title( $duplicated_id )
691+
esc_url( get_edit_post_link( $duplicated_id ) ),
692+
esc_html( get_the_title( $duplicated_id ) )
693693
);
694694
}
695695

@@ -755,8 +755,8 @@ public function check_sync() {
755755
foreach ( $synced as $synced_id ) {
756756
$links[] = sprintf(
757757
'<a href="%1$s">%2$s</a>',
758-
get_edit_post_link( $synced_id ),
759-
get_the_title( $synced_id )
758+
esc_url( get_edit_post_link( $synced_id ) ),
759+
esc_html( get_the_title( $synced_id ) )
760760
);
761761
}
762762

0 commit comments

Comments
 (0)