Merge pull request #272 from easydigitaldownloads/release/1.2.5

Release/1.2.5
awesomemotive · Mar 30, 2021 · 6cca7a3 · 6cca7a3
2 parents 0939f73 + f4baa18
commit 6cca7a3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/content/content-advanced-search.php b/content/content-advanced-search.php
@@ -13,7 +13,7 @@
 	);
 	$download_results = new WP_Query( $download_args );
 	$excerpt_length   = apply_filters( 'excerpt_length', 35 );
-	$item_prop        = edd_add_schema_microdata() ? ' itemprop="description"' : '';
+	$item_prop        = ! function_exists( 'edd_get_order' ) && edd_add_schema_microdata() ? ' itemprop="description"' : '';
 
 	if ( ! empty( $download_results->post_count ) ) : ?>
 		<div id="store-front" class="vendd-download-search-results">

diff --git a/functions.php b/functions.php
@@ -10,8 +10,8 @@
  * Constants and important files
  */
 define( 'VENDD_NAME', 'Vendd' );
-define( 'VENDD_AUTHOR', 'EDD Team' );
-define( 'VENDD_VERSION', '1.2.4' );
+define( 'VENDD_AUTHOR', 'Sandhills Development, LLC' );
+define( 'VENDD_VERSION', '1.2.5' );
 define( 'VENDD_HOME', 'https://easydigitaldownloads.com/downloads/vendd' );
 
 

diff --git a/inc/edd-functions.php b/inc/edd-functions.php
@@ -51,6 +51,10 @@ function vendd_downloads_shortcode_wrap_close() {
 function vendd_edd_shortcodes_classes( $classes ) {
 	global $post;
 
+	if( ! is_object( $post ) ) {
+		return $classes;
+	}
+
 	if ( is_a( $post, 'WP_Post' ) &&
 		has_shortcode( $post->post_content, 'edd_login' ) ||
 		has_shortcode( $post->post_content, 'edd_register' ) ||

diff --git a/inc/extras.php b/inc/extras.php
@@ -117,7 +117,7 @@ function vendd_body_classes( $classes ) {
 			$classes[] = 'vendd-failed-template vendd-edd-template';
 		}
 
-		if ( defined( 'EDD_VERSION' ) && version_compare( EDD_VERSION, '3.0', '<' ) ) {
+		if ( defined( 'EDD_VERSION' ) && version_compare( EDD_VERSION, '3.0-beta1', '<' ) ) {
 			$classes[] = 'vendd-pre-edd3';
 		}
 	}
@@ -332,4 +332,4 @@ function vendd_setup_author() {
 		$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
 	}
 }
-add_action( 'wp', 'vendd_setup_author' );
+add_action( 'wp', 'vendd_setup_author' );
diff --git a/style.css b/style.css
@@ -1,10 +1,10 @@
 /*
 Theme Name: Vendd
 Theme URI: https://easydigitaldownloads.com/downloads/vendd
-Author: EDD Team
-Author URI: https://easydigitaldownloads.com
+Author: Sandhills Development, LLC
+Author URI: https://sandhillsdev.com/
 Description: Vendd is a full-featured marketplace theme for Easy Digital Downloads and supporting extensions.
-Version: 1.2.4
+Version: 1.2.5
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: vendd
@@ -4092,4 +4092,4 @@ aside[class*="widget_edd_"] .widget-download-title {
 		font-size: 1.2em;
 		margin-bottom: 20px;
 	}
-}
+}