diff --git a/inc/class-opalestate-html.php b/inc/class-opalestate-html.php index 613511af..5f1da4da 100755 --- a/inc/class-opalestate-html.php +++ b/inc/class-opalestate-html.php @@ -364,12 +364,7 @@ class Opalestate_HTML_Elements { } public function render_form( $fields ) { - static $id_counter = 0; - if ( function_exists( 'wp_unique_id' ) ) { - $form_id = wp_unique_id( 'opalestate-form-' ); - } else { - $form_id = 'opalestate-form-' . (string) ++$id_counter; - } + $form_id = opalestate_unique_id( 'opalestate-form-' ); $output = ''; $this->form_id = $form_id; diff --git a/inc/mixes-functions.php b/inc/mixes-functions.php index 54940a46..478b90cf 100755 --- a/inc/mixes-functions.php +++ b/inc/mixes-functions.php @@ -1306,3 +1306,26 @@ function opalestate_clean( $var ) { return is_scalar( $var ) ? sanitize_text_field( $var ) : $var; } } + +/** + * Get unique ID. + * + * This is a PHP implementation of Underscore's uniqueId method. A static variable + * contains an integer that is incremented with each call. This number is returned + * with the optional prefix. As such the returned value is not universally unique, + * but it is unique across the life of the PHP process. + * + * @see wp_unique_id() Themes requiring WordPress 5.0.3 and greater should use this instead. + * + * @staticvar int $id_counter + * + * @param string $prefix Prefix for the returned ID. + * @return string Unique ID. + */ +function opalestate_unique_id( $prefix = '' ) { + static $id_counter = 0; + if ( function_exists( 'wp_unique_id' ) ) { + return wp_unique_id( $prefix ); + } + return $prefix . (string) ++$id_counter; +} diff --git a/opal-estate-pro.php b/opal-estate-pro.php index dd4f775a..dd7e0e4e 100755 --- a/opal-estate-pro.php +++ b/opal-estate-pro.php @@ -3,7 +3,7 @@ * Plugin Name: Opal Estate Pro * Plugin URI: https://wpdocs.gitbook.io/opal-estate/ * Description: Opal Real Estate Plugin is an ideal solution and brilliant choice for you to set up a professional estate website. - * Version: 1.2.5 + * Version: 1.2.6 * Author: WPOPAL * Author URI: http://www.wpopal.com * Requires at least: 4.6 @@ -151,7 +151,7 @@ if ( ! class_exists( 'OpalEstate' ) ) { */ public function __clone() { // Cloning instances of the class is forbidden - _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ huh?', 'opalestate-pro' ), '1.2.5' ); + _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ huh?', 'opalestate-pro' ), '1.2.6' ); } /** @@ -160,7 +160,7 @@ if ( ! class_exists( 'OpalEstate' ) ) { public function setup_constants() { // Plugin version if ( ! defined( 'OPALESTATE_VERSION' ) ) { - define( 'OPALESTATE_VERSION', '1.2.5' ); + define( 'OPALESTATE_VERSION', '1.2.6' ); } // Plugin Folder Path diff --git a/readme.txt b/readme.txt index 24f9fd90..b29a7c75 100755 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Donate link: https://wpdocs.gitbook.io/opal-estate/ Tags: estate, property, opalestate, house for rent, agency for lease, estate submission, agents estate property, property marketplace Requires at least: 4.6 Tested up to: 5.3 -Stable tag: 1.2.5 +Stable tag: 1.2.6 License: GPLv3 License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -156,6 +156,9 @@ This section describes how to install the plugin and get it working. * System tickets support 24/7 available : [free support](https://wpopal.ticksy.com/ "Visit the Plugin support Page") == Changelog == += 1.2.6 - 2019-12-30 = +* Fixes - Compatible WordPress version. + = 1.2.5 - 2019-12-13 = * Fixes - Slider properties. diff --git a/templates/search-box/collapse-advanced.php b/templates/search-box/collapse-advanced.php index cd5a1393..d8df51c5 100755 --- a/templates/search-box/collapse-advanced.php +++ b/templates/search-box/collapse-advanced.php @@ -7,7 +7,7 @@ defined( 'ABSPATH' ) || exit; -$unique_id = esc_attr( wp_unique_id() ); +$unique_id = esc_attr( opalestate_unique_id() ); $GLOBALS['group-info-column'] = 3; if ( isset( $nobutton ) && $nobutton ) { diff --git a/templates/search-box/collapse-city.php b/templates/search-box/collapse-city.php index 21adae08..e0019ca2 100755 --- a/templates/search-box/collapse-city.php +++ b/templates/search-box/collapse-city.php @@ -7,7 +7,7 @@ defined( 'ABSPATH' ) || exit; -$unique_id = esc_attr( wp_unique_id() ); +$unique_id = esc_attr( opalestate_unique_id() ); $GLOBALS['group-info-column'] = 4; if ( isset( $nobutton ) && $nobutton ) { diff --git a/templates/search-box/fields/categories.php b/templates/search-box/fields/categories.php index 0cf0ca75..bef02896 100755 --- a/templates/search-box/fields/categories.php +++ b/templates/search-box/fields/categories.php @@ -4,5 +4,5 @@ $scategories = isset( $_GET['cat'] ) ? $_GET['cat'] : -1; if ( isset( $ismultiple ) ) { Opalestate_Taxonomy_Categories::get_multi_check_list( $scategories ); } else { - Opalestate_Taxonomy_Categories::dropdown_list( $stypes ); + Opalestate_Taxonomy_Categories::dropdown_list( $scategories ); } diff --git a/templates/search-box/fields/more-options.php b/templates/search-box/fields/more-options.php index c297e8df..00845dc8 100755 --- a/templates/search-box/fields/more-options.php +++ b/templates/search-box/fields/more-options.php @@ -7,7 +7,7 @@ defined( 'ABSPATH' ) || exit; -$unique_id = esc_attr( wp_unique_id() ); +$unique_id = esc_attr( opalestate_unique_id() ); $amenities = Opalestate_Taxonomy_Amenities::get_list(); if ( ! $amenities ) {