From 60d034251db4ca576a9077abd9dfe40612154148 Mon Sep 17 00:00:00 2001 From: Joe Dolson Date: Tue, 7 Jan 2025 17:48:03 -0600 Subject: [PATCH] Use WP_filesystem; fix return value if not valid --- src/my-calendar-settings.php | 8 ++++++-- src/my-calendar-templates.php | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/my-calendar-settings.php b/src/my-calendar-settings.php index b70015fd..b2e4e4ba 100644 --- a/src/my-calendar-settings.php +++ b/src/my-calendar-settings.php @@ -527,7 +527,11 @@ function mc_import_settings() { if ( $nonce ) { $size = isset( $_FILES['mc-import-settings']['size'] ) ? absint( $_FILES['mc-import-settings']['size'] ) : 0; $name = isset( $_FILES['mc-import-settings']['tmp_name'] ) ? sanitize_text_field( $_FILES['mc-import-settings']['tmp_name'] ) : ''; - $settings = ( 0 !== $size ) ? file_get_contents( $name ) : false; + global $wp_filesystem; + require_once ABSPATH . '/wp-admin/includes/file.php'; + WP_Filesystem(); + + $settings = ( 0 !== $size ) ? $wp_filesystem->get_contents( $name ) : false; if ( ! $settings ) { $return = __( 'No settings file provided.', 'my-calendar' ); } else { @@ -555,8 +559,8 @@ function mc_import_settings() { $return = __( 'My Calendar settings have been replaced with the imported values.', 'my-calendar' ); } } - return $return; } + return $return; } } return ''; diff --git a/src/my-calendar-templates.php b/src/my-calendar-templates.php index 2f6e1f8d..c27dc33c 100644 --- a/src/my-calendar-templates.php +++ b/src/my-calendar-templates.php @@ -144,7 +144,11 @@ function mc_setup_template( $template, $default_template ) { // allow reference by file to external template. $template = ( 'default' === $template ) ? '' : $template; if ( '' !== $template && mc_file_exists( $template ) ) { - $template = file_get_contents( mc_get_file( $template ) ); + global $wp_filesystem; + require_once ABSPATH . '/wp-admin/includes/file.php'; + WP_Filesystem(); + + $template = $wp_filesystem->get_contents( mc_get_file( $template ) ); } if ( mc_key_exists( $template ) ) { $template = mc_get_custom_template( $template );