Merge branch 'develop' into fix/null-settings

Author: peterwilsoncc

includes/Classifai/Features/DescriptiveTextGenerator.php

@@ -313,7 +313,7 @@ public function get_alt_text_settings(): array {
 
 		if ( ! is_array( $settings['descriptive_text_fields'] ) ) {
 			return array(
-				'alt'         => 'no' === $settings['descriptive_text_fields']['caption'] ? 0 : 'alt',
+				'alt'         => 'no' === $settings['descriptive_text_fields'] ? 0 : 'alt',
 				'caption'     => 0,
 				'description' => 0,
 			);

includes/Classifai/Features/Feature.php

@@ -311,12 +311,12 @@ public function get_option_name(): string {
 	 * Returns the settings for the feature.
 	 *
 	 * @param string $index The index of the setting to return.
-	 * @return array|string
+	 * @return array|mixed
 	 */
 	public function get_settings( $index = false ) {
 		$defaults = $this->get_default_settings();
 		$settings = get_option( $this->get_option_name(), [] );
-		$settings = $this->merge_settings( $settings, $defaults );
+		$settings = $this->merge_settings( (array) $settings, (array) $defaults );
 
 		if ( $index && isset( $settings[ $index ] ) ) {
 			return $settings[ $index ];
@@ -396,7 +396,11 @@ protected function merge_settings( array $settings = [], array $defaults = [] ):
 			if ( ! array_key_exists( $key, $settings ) ) {
 				$settings[ $key ] = $defaults[ $key ];
 			} elseif ( is_array( $value ) ) {
-				$settings[ $key ] = $this->merge_settings( $settings[ $key ], $defaults[ $key ] );
+				if ( is_array( $settings[ $key ] ) ) {
+					$settings[ $key ] = $this->merge_settings( $settings[ $key ], $defaults[ $key ] );
+				} else {
+					$settings[ $key ] = $defaults[ $key ];
+				}
 			}
 		}