fix(settings): get_setting method

Automattic · Nov 16, 2023 · bb1c697 · bb1c697
1 parent 56aaa26
commit bb1c697
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/includes/class-newspack-popups-settings.php b/includes/class-newspack-popups-settings.php
@@ -186,7 +186,20 @@ function( $setting ) use ( $section, $key ) {
 	 * @param string $key Key name.
 	 */
 	public static function get_setting( $key ) {
-		return get_option( $key, true );
+		$settings = self::get_settings();
+		foreach ( $settings as $setting ) {
+			if ( $key === $setting['key'] ) {
+				return $setting['value'];
+			}
+		}
+		return new \WP_Error(
+			'newspack_popups_settings_error',
+			sprintf(
+				// Translators: Invalid settings key error.
+				__( 'Invalid settings key: %s', 'newpack-popups' ),
+				$key
+			)
+		);
 	}
 
 	/**
@@ -231,7 +244,7 @@ public static function get_settings( $assoc = false, $get_segments = false ) {
 
 		$settings_list = [
 			[
-				'description' => __( 'Donor Settings', 'newspack-ads' ),
+				'description' => __( 'Donor Settings', 'newspack-popups' ),
 				'help'        => __( 'Configure when readers are considered donors.', 'newspack-ads' ),
 				'section'     => 'donor_settings',
 				'key'         => 'active',
@@ -339,6 +352,9 @@ function( $acc, $item ) {
 			$settings_list = array_reduce(
 				$settings_list,
 				function ( $carry, $item ) {
+					if ( ! isset( $carry[ $item['section'] ] ) ) {
+						$carry[ $item['section'] ] = [];
+					}
 					$carry[ $item['section'] ][] = $item;
 					return $carry;
 				},