fix fetching settings for the api key

jhnstn · jhnstn · commit 5cb07995a5a2 · 2024-08-30T15:39:19.000-04:00
diff --git a/plugin/init.php b/plugin/init.php
@@ -49,13 +49,12 @@ function wpcloud_get_api_key(): string {
 
 	$api_key = apply_filters( 'wpcloud_api_key', $api_key );
 
-	if ( ! empty( $api_key ) ) {
+	if ( $api_key ) {
 		return $api_key;
 	}
-
 	// Else check the local options.
-	$options = get_option( 'wpcloud_options' ) ?? array();
-	return $options['wpcloud_api_key'] ?? '';
+	$settings = get_option( 'wpcloud_settings', array() );
+	return $settings['wpcloud_api_key'] ?? '';
 }
 
 /**
diff --git a/plugin/wpcloud-station.php b/plugin/wpcloud-station.php
@@ -7,7 +7,7 @@
  * Author URI:      https://wp.cloud/
  * Text Domain:     wpcloud
  * Domain Path:     /languages
- * Version:         1.0.0
+ * Version:         1.0.0-beta.1
  *
  * @package        wpcloud-station
  */

Original file line number	Diff line number	Diff line change
`@@ -49,13 +49,12 @@ function wpcloud_get_api_key(): string {`
`49`	`49`
`50`	`50`	`$api_key = apply_filters( 'wpcloud_api_key', $api_key );`
`51`	`51`
`52`		`- if ( ! empty( $api_key ) ) {`
	`52`	`+ if ( $api_key ) {`
`53`	`53`	`return $api_key;`
`54`	`54`	`}`
`55`		`-`
`56`	`55`	`// Else check the local options.`
`57`		`- $options = get_option( 'wpcloud_options' ) ?? array();`
`58`		`- return $options['wpcloud_api_key'] ?? '';`
	`56`	`+ $settings = get_option( 'wpcloud_settings', array() );`
	`57`	`+ return $settings['wpcloud_api_key'] ?? '';`
`59`	`58`	`}`
`60`	`59`
`61`	`60`	`/**`