Merge branch 'release/1.3.1'

admin/about/page-github.php

@@ -1,5 +1,5 @@
 <h3><?php _e( 'Developed on Github', 'influence' ) ?></h3>
-<img src="<?php echo get_template_directory_uri() ?>/admin/about/github.png" class="about-image-right about-image-no-text-below" />
+<img src="<?php echo esc_url( get_template_directory_uri() ) ?>/admin/about/github.png" class="about-image-right about-image-no-text-below" />
 <p>
 	<?php printf( __( "Influence is actively %sdeveloped on Github%s.", 'influence' ), '<a href="https://github.com/siteorigin/influence">', '</a>' ) ?>
 	<?php _e( "You can watch what's happening with its development and even make contributions yourself.", 'influence' ) ?>

build-config.js

@@ -19,7 +19,8 @@ module.exports = {
 	},
 	version: {
 		src: [
-			'functions.php'
+			'functions.php',
+			'readme.txt'
 		]
 	},
 	sass: {

demo/slider.php

@@ -1,11 +1,11 @@
 <div class="sow-slider-base" style="display: none">
 
 	<ul class="sow-slider-images" data-settings="{&quot;pagination&quot;:true,&quot;speed&quot;:850,&quot;timeout&quot;:5000}">
-		<li class="sow-slider-image sow-slider-image-cover" style="background-image: url(<?php echo get_template_directory_uri() ?>/demo/assets/slide-2.jpg);">
+		<li class="sow-slider-image sow-slider-image-cover" style="background-image: url(<?php echo esc_url( get_template_directory_uri() ) ?>/demo/assets/slide-2.jpg);">
 
 			<div class="sow-slider-image-container">
 				<div class="sow-slider-image-wrapper" style="max-width: 720px;">
-					<img width="720" height="500" src="<?php echo get_template_directory_uri() ?>/demo/assets/slider-badge.png" class="attachment-full" alt="slider-badge">
+					<img width="720" height="500" src="<?php echo esc_url( get_template_directory_uri() ) ?>/demo/assets/slider-badge.png" class="attachment-full" alt="slider-badge">
 				</div>
 			</div>
 
@@ -15,13 +15,13 @@
 
 			<div class="sow-slider-image-container">
 				<div class="sow-slider-image-wrapper" style="max-width: 700px;">
-					<img width="700" height="500" src="<?php echo get_template_directory_uri() ?>/demo/assets/slider-badge-2.png" class="attachment-full" alt="slider-badge-2">
+					<img width="700" height="500" src="<?php echo esc_url( get_template_directory_uri() ) ?>/demo/assets/slider-badge-2.png" class="attachment-full" alt="slider-badge-2">
 				</div>
 			</div>
 
 			<video class="sow-background-element" autoplay="" loop="" muted="">
-				<source src="<?php echo get_template_directory_uri() ?>/demo/assets/writing-video.mp4" type="video/mp4">
-				<source src="<?php echo get_template_directory_uri() ?>/demo/assets/writing-video.ogv" type="video/ogg">
+				<source src="<?php echo esc_url( get_template_directory_uri() ) ?>/demo/assets/writing-video.mp4" type="video/mp4">
+				<source src="<?php echo esc_url( get_template_directory_uri() ) ?>/demo/assets/writing-video.ogv" type="video/ogg">
 			</video>
 
 		</li>

functions.php

@@ -216,10 +216,10 @@ function influence_body_class( $classes ) {
 function influence_wp_head() {
 	?>
 	<!--[if lt IE 9]>
-		<script src="<?php echo get_template_directory_uri(); ?>/js/html5.js" type="text/javascript"></script>
+		<script src="<?php echo esc_url( get_template_directory_uri() ) ?>/js/html5.js" type="text/javascript"></script>
 	<![endif]-->
 	<!--[if (gte IE 6)&(lte IE 8)]>
-		<script type="text/javascript" src="<?php echo get_template_directory_uri(); ?>/js/selectivizr.js"></script>
+		<script type="text/javascript" src="<?php echo esc_url( get_template_directory_uri() ) ?>/js/selectivizr.js"></script>
 	<![endif]-->
 	<?php
 }

inc/customizer/customizer.php

@@ -94,7 +94,7 @@ function css() {
 			}
 			$import = array_unique( $import );
 			if ( !empty( $import ) ) {
-				$return .= '@import url(//fonts.googleapis.com/css?family=' . implode( '|', $import ) . '); ';
+				$return .= '@import url(//fonts.googleapis.com/css?family=' . implode( '|', $import ) . '&display=block); ';
 			}
 		}
 
@@ -177,13 +177,16 @@ function add_web_font( $selector, $mod ) {
 		}
 
 		$this->add_css( $selector, 'font-family', $family );
-		if ( $variant != 400 ) $this->add_css( $selector, 'font-weight', $variant );
-
-		$this->fonts[ ] = $font;
-
-		if ( !empty( $variant ) ) {
-			if ( $variant == 'regular' ) $variant = '400';
-			$this->css[ $selector ][ ] = 'font-weight: ' . $variant;
+		if ( ! empty( $variant ) ) {
+			if ( $variant != 400 && $variant != 'regular' ) {
+				if ( ! is_numeric( $variant ) ) {
+					$variant = filter_var( $variant, FILTER_SANITIZE_NUMBER_INT );
+					$this->add_css( $selector, 'font-style', 'italic' );
+				}
+				$this->add_css( $selector, 'font-weight', $variant );
+			} else {
+				$this->add_css( $selector, 'font-weight', 400 );
+			}
 		}
 	}
 
@@ -327,7 +330,7 @@ class SiteOrigin_Customizer_Helper {
 	private $sections;
 	private $defaults;
 
-	function __construct($settings = array(), $sections = array(), $theme, $root_url = false, $make_single = true){
+	function __construct($settings = array(), $sections = array(), $theme = 'generic', $root_url = false, $make_single = true){
 		// Give child themes a chance to filter this.
 		$this->theme = $theme;
 		$this->defaults = array();

inc/extras.php

@@ -52,33 +52,6 @@ function influence_enhanced_image_navigation( $url, $id ) {
 }
 add_filter( 'attachment_link', 'influence_enhanced_image_navigation', 10, 2 );
 
-/**
- * Filters wp_title to print a neat <title> tag based on what is being viewed.
- *
- * @since influence 1.0
- */
-function influence_wp_title( $title, $sep ) {
-	global $page, $paged;
-
-	if ( is_feed() )
-		return $title;
-
-	// Add the blog name
-	$title .= get_bloginfo( 'name' );
-
-	// Add the blog description for the home/front page.
-	$site_description = get_bloginfo( 'description', 'display' );
-	if ( $site_description && ( is_home() || is_front_page() ) )
-		$title .= " $sep $site_description";
-
-	// Add a page number if necessary:
-	if ( $paged >= 2 || $page >= 2 )
-		$title .= " $sep " . sprintf( __( 'Page %s', 'influence' ), max( $paged, $page ) );
-
-	return $title;
-}
-add_filter( 'wp_title', 'influence_wp_title', 10, 2 );
-
 /**
  * Add the styles to set the size of the footer widgets
  * 

readme.txt

@@ -2,8 +2,9 @@
 
 Contributors: siteorigin
 Tags: one-column, two-columns, custom-background, custom-colors, custom-logo, custom-menu, featured-images, footer-widgets, sticky-post, theme-options, threaded-comments, translation-ready, blog, photography, portfolio
+Tested up to: 5.8
 Requires at least: 4.7
-Tested up to: 5.2
+Requires PHP: 5.6.20
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -89,6 +90,10 @@ This theme makes use of the SiteOrigin Settings Framework contained in the /inc
 
 == Changelog ==
 
+== 1.3.1 - 20 June 2021 ==
+* Set Google font display to block.
+* Updated SiteOrigin Settings framework.
+
 == 1.3 - 13 October 2019 ==
 * Added Custom Logo support.
 * Minor code style fixes.

style.css

@@ -5,8 +5,11 @@ Author URI: https://siteorigin.com/
 Theme URI: https://siteorigin.com/theme/influence/
 Description: Influence is a free WordPress theme that gives you a canvas to share your videos, photography and content. It features a modern, responsive design and tight integration with our own Page Builder plugin to make sure your content is responsive too. The best feature of Influence is its huge home page slider - perfect if you're using Influence to build a business or portfolio website. This slider has support for video background images and, like the rest of Influence, is fully responsive. We offer free support on our support <a href="http://siteorigin.com/thread/">forums</a> (http://siteorigin.com/thread/).
 Version: dev
-License: GNU General Public License
-License URI: http://www.gnu.org/copyleft/gpl.html
+Tested up to: 5.8
+Requires at least: 4.7
+Requires PHP: 5.6.20
+License: GNU General Public License v2 or later
+License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: one-column, two-columns, custom-background, custom-colors, custom-logo, custom-menu, featured-images, footer-widgets, sticky-post, theme-options, threaded-comments, translation-ready, blog, photography, portfolio
 Text Domain: influence
 */
@@ -298,7 +301,7 @@ sup {
   bottom: 1ex;
 }
 sub {
-  top: .5ex;
+  top: 0.5ex;
 }
 small {
   font-size: 75%;
@@ -858,7 +861,7 @@ article.sticky {
   bottom: 1ex;
 }
 .entry-content sub {
-  top: .5ex;
+  top: 0.5ex;
 }
 .entry-content .gallery {
   margin: 25px 0 !important;

style.less

@@ -5,8 +5,11 @@ Author URI: https://siteorigin.com/
 Theme URI: https://siteorigin.com/theme/influence/
 Description: Influence is a free WordPress theme that gives you a canvas to share your videos, photography and content. It features a modern, responsive design and tight integration with our own Page Builder plugin to make sure your content is responsive too. The best feature of Influence is its huge home page slider - perfect if you're using Influence to build a business or portfolio website. This slider has support for video background images and, like the rest of Influence, is fully responsive. We offer free support on our support <a href="http://siteorigin.com/thread/">forums</a> (http://siteorigin.com/thread/).
 Version: dev
-License: GNU General Public License
-License URI: http://www.gnu.org/copyleft/gpl.html
+Tested up to: 5.8
+Requires at least: 4.7
+Requires PHP: 5.6.20
+License: GNU General Public License v2 or later
+License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: one-column, two-columns, custom-background, custom-colors, custom-logo, custom-menu, featured-images, footer-widgets, sticky-post, theme-options, threaded-comments, translation-ready, blog, photography, portfolio
 Text Domain: influence
 */