#1444

kprovance · kprovance · commit 10cf910dee59 · 2014-07-10T13:39:57.000-04:00
Signed-off-by:KProvance &lt;kevin.provance@gmail.com&gt;
diff --git a/ReduxCore/inc/fields/typography/field_typography.php b/ReduxCore/inc/fields/typography/field_typography.php
@@ -581,12 +581,14 @@ function makeGoogleWebfontLink($fonts) {
                 }
                 $link.= $family;
 
-                if (!empty($font['font-style'])) {
+                if (!empty($font['font-style']) || !empty($font['all-styles'])) {
                     $link.= ':';
+                    print_r($font['all-styles']);
                     if (!empty($font['all-styles'])) {
-                        $link.= implode(',', $font['all-styles']);
+                        
+                        $link .= implode(',', $font['all-styles']);
                     } else if (!empty($font['font-style'])) {
-                        $link.= implode(',', $font['font-style']);
+                        $link .= implode(',', $font['font-style']);
                     }
                 }
 
@@ -623,7 +625,7 @@ function makeGoogleWebfontString($fonts) {
                 }
                 $link.= $family;
 
-                if (!empty($font['font-style'])) {
+                if (!empty($font['font-style']) || !empty($font['all-styles'])) {
                     $link.= ':';
                     if (!empty($font['all-styles'])) {
                         $link.= implode(',', $font['all-styles']);

Original file line number	Diff line number	Diff line change
`@@ -581,12 +581,14 @@ function makeGoogleWebfontLink($fonts) {`
`581`	`581`	`}`
`582`	`582`	`$link.= $family;`
`583`	`583`
`584`		`- if (!empty($font['font-style'])) {`
	`584`	`+ if (!empty($font['font-style']) \|\| !empty($font['all-styles'])) {`
`585`	`585`	`$link.= ':';`
	`586`	`+ print_r($font['all-styles']);`
`586`	`587`	`if (!empty($font['all-styles'])) {`
`587`		`- $link.= implode(',', $font['all-styles']);`
	`588`	`+`
	`589`	`+ $link .= implode(',', $font['all-styles']);`
`588`	`590`	`} else if (!empty($font['font-style'])) {`
`589`		`- $link.= implode(',', $font['font-style']);`
	`591`	`+ $link .= implode(',', $font['font-style']);`
`590`	`592`	`}`
`591`	`593`	`}`
`592`	`594`
`@@ -623,7 +625,7 @@ function makeGoogleWebfontString($fonts) {`
`623`	`625`	`}`
`624`	`626`	`$link.= $family;`
`625`	`627`
`626`		`- if (!empty($font['font-style'])) {`
	`628`	`+ if (!empty($font['font-style']) \|\| !empty($font['all-styles'])) {`
`627`	`629`	`$link.= ':';`
`628`	`630`	`if (!empty($font['all-styles'])) {`
`629`	`631`	`$link.= implode(',', $font['all-styles']);`