Browse Source

Mayland: Revise conditionals to fix array offset issue, cody tidying.

Allan Cole 5 years ago
parent
commit
f7273da8f8
1 changed files with 9 additions and 9 deletions
  1. 9 9
      mayland/functions.php

+ 9 - 9
mayland/functions.php

@@ -58,11 +58,11 @@ if ( ! function_exists( 'mayland_setup' ) ) :
 		 *
 		 *
 		 * - if the customizer color is empty, use the default
 		 * - if the customizer color is empty, use the default
 		 */
 		 */
-		$colors_array = get_theme_mod('colors_manager'); // color annotations array()
-		$background   = $colors_array['colors']['bg'];   // $config-global--color-background-default;
-		$primary      = $colors_array['colors']['link']; // $config-global--color-primary-default;
-		$foreground   = $colors_array['colors']['txt'];  // $config-global--color-foreground-default;
-		$secondary    = $colors_array['colors']['fg1'];  // $config-global--color-secondary-default;
+		$colors_array = get_theme_mod( 'colors_manager' ); // color annotations array()
+		$primary      = ! empty( $colors_array ) ? $colors_array['colors']['link'] : '#000000'; // $config-global--color-primary-default;
+		$secondary    = ! empty( $colors_array ) ? $colors_array['colors']['fg1'] : '#1a1a1a';  // $config-global--color-secondary-default;
+		$foreground   = ! empty( $colors_array ) ? $colors_array['colors']['txt'] : '#010101';  // $config-global--color-foreground-default;
+		$background   = ! empty( $colors_array ) ? $colors_array['colors']['bg'] : '#FFFFFF';   // $config-global--color-background-default;
 
 
 		// Editor color palette.
 		// Editor color palette.
 		add_theme_support(
 		add_theme_support(
@@ -71,22 +71,22 @@ if ( ! function_exists( 'mayland_setup' ) ) :
 				array(
 				array(
 					'name'  => __( 'Primary', 'mayland' ),
 					'name'  => __( 'Primary', 'mayland' ),
 					'slug'  => 'primary',
 					'slug'  => 'primary',
-					'color' => ! isset($primary) ? '#000000' : $primary,
+					'color' => $primary,
 				),
 				),
 				array(
 				array(
 					'name'  => __( 'Secondary', 'mayland' ),
 					'name'  => __( 'Secondary', 'mayland' ),
 					'slug'  => 'secondary',
 					'slug'  => 'secondary',
-					'color' => ! isset($secondary) ? '#1a1a1a' : $secondary,
+					'color' => $secondary,
 				),
 				),
 				array(
 				array(
 					'name'  => __( 'Foreground', 'mayland' ),
 					'name'  => __( 'Foreground', 'mayland' ),
 					'slug'  => 'foreground',
 					'slug'  => 'foreground',
-					'color' => ! isset($foreground) ? '#010101' : $foreground,
+					'color' => $foreground,
 				),
 				),
 				array(
 				array(
 					'name'  => __( 'Background', 'mayland' ),
 					'name'  => __( 'Background', 'mayland' ),
 					'slug'  => 'background',
 					'slug'  => 'background',
-					'color' => ! isset($background) ? '#FFFFFF' : $background,
+					'color' => $background,
 				),
 				),
 			)
 			)
 		);
 		);