Use WP_filesystem; fix return value if not valid

joedolson · Jan 7, 2025 · 60d0342 · 60d0342
1 parent 6b168b5
commit 60d0342
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -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 );