implemented automatic https asset paths, fixes #140

kontur · Mar 30, 2018 · 59095ce · 59095ce
1 parent 1dbb870
commit 59095ce
Show file tree

Hide file tree

Showing 7 changed files with 131 additions and 22,841 deletions.
diff --git a/FontsamplerHelpers.php b/FontsamplerHelpers.php
@@ -322,6 +322,9 @@ function get_best_file_from_fonts( $fonts ) {
 				}
 			}
 			if ( false !== $best ) {
+                if (is_ssl() && substr($best, 0, 7) === "http://") {
+                    $best = str_replace("http://", "https://", $best);
+				}
 				$fontsFiltered[ $font['id'] ] = $best;
 			}
 		}

diff --git a/FontsamplerPlugin.php b/FontsamplerPlugin.php
@@ -208,6 +208,8 @@ function fontsampler_shortcode( $atts ) {
 			$css   = $this->helpers->get_custom_css( $set ); // returns false or link to generated custom css
 			$fonts = $this->helpers->get_best_file_from_fonts( $this->db->get_fontset_for_set( intval( $attributes['id'] ) ) );
 
+            var_dump($fonts);
+
 			if ( false !== $css ) {
 				wp_enqueue_style( 'fontsampler-interface-' . $id, $css, array(), false );
 			}
@@ -349,7 +351,6 @@ function fontsampler_shortcode( $atts ) {
 
 			<?php
 
-
 			// include, aka echo, template with replaced values from $replace above
 			include( 'includes/interface.php' );