Merge pull request #825 from easypropertylistings/3.4.7-master

3.4.7 master

apigen.neon

@@ -21,7 +21,7 @@ charset: [UTF-8]
 main: EPL
 
 # title of generated documentation
-title: Easy Property Listings 3.4.6 Code Reference
+title: Easy Property Listings 3.4.7 Code Reference
 
 # base url used for sitemap (useful for public doc)
 baseUrl: http://docs.easypropertylistings.com.au/

easy-property-listings.php

@@ -5,7 +5,7 @@
  * Description:  Fast. Flexible. Forward-thinking solution for real estate agents using WordPress. Easy Property Listing is one of the most dynamic and feature rich Real Estate plugin for WordPress available on the market today. Built for scale, contact generation and works with any theme!
  * Author: Merv Barrett
  * Author URI: http://www.realestateconnected.com.au/
- * Version: 3.4.6
+ * Version: 3.4.7
  * Text Domain: easy-property-listings
  * Domain Path: languages
  *
@@ -25,7 +25,7 @@
  * @package EPL
  * @category Core
  * @author Merv Barrett
- * @version 3.4.6
+ * @version 3.4.7
  */
 
 // Exit if accessed directly.
@@ -94,7 +94,7 @@ public static function instance() {
 		public function setup_constants() {
 			// Plugin version.
 			if ( ! defined( 'EPL_PROPERTY_VER' ) ) {
-				define( 'EPL_PROPERTY_VER', '3.4.6' );
+				define( 'EPL_PROPERTY_VER', '3.4.7' );
 			}
 			// Plugin DB version.
 			if ( ! defined( 'EPL_PROPERTY_DB_VER' ) ) {

languages/easy-property-listings.pot

@@ -2,10 +2,10 @@
 # This file is distributed under the same license as the Easy Property Listings package.
 msgid ""
 msgstr ""
-"Project-Id-Version: Easy Property Listings 3.4.6\n"
+"Project-Id-Version: Easy Property Listings 3.4.7\n"
 "Report-Msgid-Bugs-To: "
 "http://wordpress.org/support/plugin/easy-property-listings\n"
-"POT-Creation-Date: 2019-09-09 06:12:47+00:00\n"
+"POT-Creation-Date: 2019-09-16 02:39:31+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

lib/assets/assets-svg.php

@@ -353,6 +353,9 @@ function epl_get_svg_allowed_tags() {
 			'class'  => true,
 			'points' => true,
 		),
+		'use'     => array(
+			'xlink:href' => true,
+		),
 	);
 	return apply_filters( 'epl_svg_allowed_tags', $tags );
 }

lib/includes/class-epl-property-meta.php

@@ -736,7 +736,7 @@ public function get_price() {
 		$prop_price_view = $this->get_property_meta( 'property_price_view' );
 		$prop_com_rent   = $this->get_property_com_rent();
 		$price           = '';
-		if ( 'property' === $this->post_type || 'land' === $this->post_type || 'rural' === $this->post_type ) {
+		if ( 'property' === $this->post_type || 'land' === $this->post_type || 'rural' === $this->post_type || 'business' === $this->post_type ) {
 			if ( 'sold' === $this->get_property_meta( 'property_status' ) ) {
 				$price = '<span class="page-price sold-status">' . $this->label_sold . $this->get_property_price_sold_display() . '</span>';
 			} elseif ( ! empty( $price_display ) && 'yes' === $this->get_property_meta( 'property_price_display' ) ) {   // Property.
@@ -775,7 +775,7 @@ public function get_price() {
 			} else {
 				$price = '<span class="page-price">' . __( 'TBA', 'easy-property-listings' ) . '</span>';
 			}
-		} elseif ( 'commercial' === $this->post_type || 'business' === $this->post_type || 'commercial_land' === $this->post_type ) {
+		} elseif ( 'commercial' === $this->post_type || 'commercial_land' === $this->post_type ) {
 			$prop_com_rent_period = $this->get_property_meta( 'property_com_rent_period' );
 			$rent_lease_type      =
 				! empty( $prop_com_rent_period ) ? epl_listing_load_meta_commercial_rent_period_value( $this->get_property_meta( 'property_com_rent_period' ) ) : __( 'P.A.', 'easy-property-listings' );
@@ -881,7 +881,7 @@ public function get_price_sticker() {
 
 		$inspection_time = $this->get_property_meta( 'property_inspection_times' );
 		$inspection_time = trim( $inspection_time );
-		if ( 'property' === $this->post_type || 'land' === $this->post_type || 'rural' === $this->post_type ) {
+		if ( 'property' === $this->post_type || 'land' === $this->post_type || 'rural' === $this->post_type || 'business' === $this->post_type ) {
 			$price_sticker = '';
 			if ( 'sold' === $this->get_property_meta( 'property_status' ) ) {
 				$price_sticker .= '<span class="status-sticker sold">' . $this->label_sold . '</span>';
@@ -917,7 +917,7 @@ public function get_price_sticker() {
 					$price_sticker .= '<span class="status-sticker open">' . $this->get_epl_settings( 'label_home_open' ) . '</span>';
 				}
 			}
-		} elseif ( 'commercial' === $this->post_type || 'business' === $this->post_type || 'commercial_land' === $this->post_type ) {
+		} elseif ( 'commercial' === $this->post_type || 'commercial_land' === $this->post_type ) {
 			$price_sticker = '';
 			if ( 'sold' === $this->get_property_meta( 'property_status' ) ) {
 				$price_sticker .= '<span class="status-sticker sold">' . $this->label_sold . '</span>';
@@ -945,7 +945,7 @@ public function get_l_price() {
 		$price_display = $this->get_property_price_display();
 		$l_price       = '';
 
-		if ( 'property' === $this->post_type || 'land' === $this->post_type || 'rural' === $this->post_type ) {
+		if ( 'property' === $this->post_type || 'land' === $this->post_type || 'rural' === $this->post_type || 'business' === $this->post_type ) {
 			if ( 'sold' === $this->get_property_meta( 'property_status' ) ) {
 				$l_price = '<li class="page-price sold-status">' . $this->label_sold . '</li>';
 			} elseif ( ! empty( $price_display ) && 'yes' === $this->get_property_meta( 'property_price_display' ) ) {   // Property.
@@ -972,7 +972,7 @@ public function get_l_price() {
 				$l_price = '<li class="page-price sold-status">' . $this->label_leased . '</li>';
 
 			}
-		} elseif ( 'commercial' === $this->post_type || 'business' === $this->post_type || 'commercial_land' === $this->post_type ) {
+		} elseif ( 'commercial' === $this->post_type || 'commercial_land' === $this->post_type ) {
 			$prop_com_rent_period = $this->get_property_meta( 'property_com_rent_period' );
 			$prop_com_rent        = $this->get_property_com_rent();
 			$rent_lease_type      =

package.json

@@ -1,7 +1,7 @@
 {
   "name": "easy-property-listings",
   "title": "Easy Property Listings",
-  "version": "3.4.6",
+  "version": "3.4.7",
   "homepage": "https://easypropertylistings.com.au/",
   "repository": {
     "type": "git",

readme.txt

@@ -393,6 +393,11 @@ Yes, through the addition of one or more of the add-on integrations, you can qui
 
 == Changelog ==
 
+= 3.4.7 September 16, 2019 =
+
+* Tweak: Whitelist use tag for SVG usage.
+* Fix: Correct business listing type pricing display, behaves like listing for sale.
+
 = 3.4.6 September 9, 2019 =
 
 * Tweak: Support for polygon tag in SVG icons.