Release prep

ajaxloadmore · Sep 27, 2023 · 7214381 · 7214381
1 parent bab0c33
commit 7214381
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 40 deletions.
diff --git a/README.txt b/README.txt
@@ -5,7 +5,7 @@ Tags: infinite scroll, load more, ajax, lazy load, endless scroll, infinite scro
 Requires at least: 4.4
 Requires PHP: 5.6
 Tested up to: 6.3
-Stable tag: 6.1.0.1
+Stable tag: 6.2.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -261,6 +261,18 @@ How to install Ajax Load More.
 
 == Changelog ==
 
+= 6.2.0 - September 27, 2023 =
+* UPDATE: Added support for GA4 integration across various add-ons.
+* UPDATE: Updated Shortcode builder to accept new plugin parameters for Next Page add-on.
+* UPDATE: Code cleanup and organization.
+* FIX: Fixed issue with encoding of Canonical URL potentially causing http errors in Ajax request.
+* FIX: Fixed various issues in Shortcode Builder.
+* FIX: Fixed issue with unclosed HTML element when using seo_offset parameter.
+* FIX: Fixed issue with default ALM search parameter being encoded incorrectly.
+* FIX: Fixed issue with seo_offset parameter not displaying results due to JS error.
+* FIX: Various security fixes and patches.
+
+
 = 6.1.0.1 - August 8, 2023 =
 * HOTFIX: Fixed issue with querying data using `custom_args` parameter.
 * HOTFIX: Fixed issue with querying data using the `vars` parameter.

diff --git a/ajax-load-more.php b/ajax-load-more.php
@@ -7,50 +7,15 @@
  * Author: Darren Cooney
  * Twitter: @KaptonKaos
  * Author URI: https://connekthq.com
- * Version: 6.1.0.1
+ * Version: 6.2.0
  * License: GPL
  * Copyright: Darren Cooney & Connekt Media
  *
  * @package AjaxLoadMore
  */
 
-/*
-* FIX: Fixed issue with encoding of Canonical URL potentially causing http errors in Ajax request.
-* FIX: Fixed various issues in Shortcode Builder.
-* FIX: Fixed issue with unclosed HTML element when using seo_offset parameter.
-* FIX: Fixed issue with default ALM search parameter being encoded incorrectly.
-* FIX: Fixed issue with seo_offset parameter not displaying results due to JS error.
-* UPDATE: Updated Shortcode builder to accept new plugin parameters for Next Page add-on.
-* UPDATE: Code cleanup and organization.
-
-
-IN PROGRESS
-- Pageviews. Set pageviews, once and have it trickle down to all ALM instances.
-	- Elementor [DONE]
-	- Filters [DONE]
-	- Next Page [DONE]
-	- SEO [DONE]
-	- Single Posts [DONE]
-	- WooCommerce [DONE]
-
-ADD-ONS
-
-Elementor - 1.1.5
-SEO - 1.9.5
-Single Posts - 1.5.6
-WooCommerce - 1.2.4
-NEXT PAGE - 1.7.0
-FILTERS - 2.2.1
-
-PAGING
-- TODO
-- Update animations, make it faster.
-- Scrol user to top of list when using paging.
-
-*/
-
-define( 'ALM_VERSION', '6.1.0.1' );
-define( 'ALM_RELEASE', 'August 8, 2023' );
+define( 'ALM_VERSION', '6.2.0' );
+define( 'ALM_RELEASE', 'September 27, 2023' );
 define( 'ALM_STORE_URL', 'https://connekthq.com' );
 
 // Plugin installation helpers.

diff --git a/core/classes/class-alm-shortcode.php b/core/classes/class-alm-shortcode.php
@@ -25,6 +25,13 @@ class ALM_SHORTCODE {
 		 */
 		public static $counter = 0;
 
+		/**
+		 * Default container type.
+		 *
+		 * @var string
+		 */
+		public static $default_container_type = 'ul';
+
 		/**
 		 * Parse & render ALM shortcode.
 		 *
@@ -400,7 +407,7 @@ public static function alm_render_shortcode( $atts ) {
 			}
 
 			// Get container elements (ul | div).
-			$container_element = 'ul';
+			$container_element = self::$default_container_type;
 			if ( isset( $options ) && ( isset( $options['_alm_container_type'] ) && '2' === $options['_alm_container_type'] || $single_post ) ) {
 				$container_element = 'div';
 			}
@@ -818,6 +825,10 @@ public static function alm_render_shortcode( $atts ) {
 			// Set class for when ALM has a transition container.
 			$has_transition_class = $transition_container === 'true' ? ' alm-has-transition' : ' alm-no-transition';
 
+			// Confirm container element type is valid.
+			$container_element_array = [ 'ul', 'ol', 'div', 'article', 'table', 'section', 'dl' ];
+			$container_element       = in_array( $container_element, $container_element_array, true ) ? $container_element : 'ul';
+
 			// Open #ajax-load-more.
 			$ajaxloadmore .= '<' . esc_attr( $container_element ) . ' aria-live="polite" aria-atomic="true"';
 			$ajaxloadmore .= ' class="' . esc_attr( $listing_class ) . ' alm-ajax' . esc_attr( $has_transition_class ) . esc_attr( $paging_container_class ) . esc_attr( $classname ) . esc_attr( $css_classes ) . '"';