Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions secure-custom-fields.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function initialize() {

// Define settings.
$this->settings = array(
'name' => __( 'Secure Custom Fields', 'secure-custom-fields' ),
'name' => 'Secure Custom Fields', // Will be updated in the init hook to i18n string.
'slug' => dirname( ACF_BASENAME ),
'version' => ACF_VERSION,
'basename' => ACF_BASENAME,
Expand Down Expand Up @@ -207,18 +207,6 @@ public function initialize() {
acf_include( 'includes/ajax/class-acf-ajax-query-users.php' );
acf_include( 'includes/ajax/class-acf-ajax-local-json-diff.php' );

// Include forms.
acf_include( 'includes/forms/form-attachment.php' );
acf_include( 'includes/forms/form-comment.php' );
acf_include( 'includes/forms/form-customizer.php' );
acf_include( 'includes/forms/form-front.php' );
acf_include( 'includes/forms/form-nav-menu.php' );
acf_include( 'includes/forms/form-post.php' );
acf_include( 'includes/forms/form-gutenberg.php' );
acf_include( 'includes/forms/form-taxonomy.php' );
acf_include( 'includes/forms/form-user.php' );
acf_include( 'includes/forms/form-widget.php' );

// Include admin.
if ( is_admin() ) {
acf_include( 'includes/admin/admin.php' );
Expand Down Expand Up @@ -269,6 +257,9 @@ public function init() {
// Load textdomain file.
acf_load_textdomain();

// Update the name setting now that we're in the init hook.
acf_update_setting( 'name', __( 'Secure Custom Fields', 'secure-custom-fields' ) );

// Include 3rd party compatiblity.
acf_include( 'includes/third-party.php' );

Expand All @@ -277,6 +268,18 @@ public function init() {
acf_include( 'includes/wpml.php' );
}

// Include forms.
acf_include( 'includes/forms/form-attachment.php' );
acf_include( 'includes/forms/form-comment.php' );
acf_include( 'includes/forms/form-customizer.php' );
acf_include( 'includes/forms/form-front.php' );
acf_include( 'includes/forms/form-nav-menu.php' );
acf_include( 'includes/forms/form-post.php' );
acf_include( 'includes/forms/form-gutenberg.php' );
acf_include( 'includes/forms/form-taxonomy.php' );
acf_include( 'includes/forms/form-user.php' );
acf_include( 'includes/forms/form-widget.php' );

// Add post types and taxonomies.
if ( acf_get_setting( 'enable_post_types' ) ) {
acf_include( 'includes/post-types/class-acf-taxonomy.php' );
Expand Down