Merge pull request #201 from ResponsiveMenu/dev

Release 4.1.12

Author: etvarun

readme.txt

@@ -3,7 +3,7 @@ Contributors: expresstech, responsivemenu, imvarunkmr, surajkumarsingh, infosate
 Tags: responsive, mega menu, navigation, mobile, hamburger
 Requires at least: 3.6
 Tested up to: 6.0
-Stable tag: 4.1.11
+Stable tag: 4.1.12
 Requires PHP: 5.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -120,6 +120,10 @@ To view our FAQ, please go to [https://responsive.menu/faq/](https://responsive.
 
 == Changelog ==
 
+= 4.1.12 (1st Aug 2022) =
+* Bug: Fixed conflict issues with conflict with Multiple Page Generator Plugin
+* Enhancement: Added timestamps as a version to generated CSS/JSS urls
+
 = 4.1.11 (25th May 2022) =
 * Bug: Fixed conflict issues with Import Eventbrite Events plugin
 * Enhancement: Added rmp_nav_item_class hook to update nav item classes

responsive-menu.php

@@ -4,7 +4,7 @@
 Plugin Name: Responsive Menu
 Plugin URI: https://expresstech.io
 Description: Highly Customisable Responsive Menu Plugin for WordPress
-Version: 4.1.11
+Version: 4.1.12
 Author: ExpressTech
 Text Domain: responsive-menu
 Author URI: https://responsive.menu
@@ -16,7 +16,7 @@
  * Constant as plugin version.
  */
 if ( ! defined( 'RMP_PLUGIN_VERSION' ) ) {
-	define( 'RMP_PLUGIN_VERSION', '4.1.11' );
+	define( 'RMP_PLUGIN_VERSION', '4.1.12' );
 }
 
 define( 'RESPONSIVE_MENU_URL', plugin_dir_url( __FILE__ ) );

v4.0.0/inc/classes/class-style-manager.php

@@ -107,7 +107,7 @@ public function get_menus_scss_to_css() {
 	 */
 	public function save_style_css_on_file() {
 		global $wp_filesystem;
-
+		update_option('rmp_dynamic_file_version', current_time('H.i.s') );
 		if ( empty( $wp_filesystem ) ) {
 			require_once ABSPATH . 'wp-admin/includes/file.php';
 		}
@@ -152,7 +152,7 @@ public function enqueue_styles_as_file() {
 			// Ensure we're using the correct protocol.
 			$file_url = str_replace( array( 'http://', 'https://' ), $protocol, $file_url );
 
-			wp_enqueue_style( 'rmp-menu-styles', $file_url, false, substr( md5( filemtime( $file_path ) ), 0, 6 ) );
+			wp_enqueue_style( 'rmp-menu-styles', $file_url, false, get_option('rmp_dynamic_file_version', wp_rand( 100, 1000 ) ) );
 		}
 	}
 

v4.0.0/inc/helpers/custom-functions.php

@@ -98,16 +98,14 @@ function get_all_rmp_menu_ids() {
 		'post_status'    => 'publish',
 	);
 
-	$query    = new \WP_Query( $args );
+	$all_menus    = get_posts( $args );
 	$menu_ids = array();
 
-	if ( $query->have_posts() ) {
-		while ( $query->have_posts() ) {
-			$query->the_post();
-			$menu_ids[] = get_the_ID();
+	if ( ! empty( $all_menus ) ) {
+		foreach ( $all_menus as $menu ) {
+			setup_postdata( $menu );
+			$menu_ids[] = $menu->ID;
 		}
-
-		wp_reset_postdata();
 	}
 
 	return $menu_ids;
@@ -126,16 +124,14 @@ function rmp_get_all_menus() {
 		'post_status'    => 'publish',
 	);
 
-	$query = new \WP_Query( $args );
+	$all_menus    = get_posts( $args );
 	$menus = array();
 
-	if ( $query->have_posts() ) {
-		while ( $query->have_posts() ) {
-			$query->the_post();
-			$menus[ get_the_ID() ] = get_the_title();
+	if ( ! empty( $all_menus ) ) {
+		foreach ( $all_menus as $menu ) {
+			setup_postdata( $menu );
+			$menus[ $menu->ID ] = $menu->post_title;
 		}
-
-		wp_reset_postdata();
 	}
 
 	return $menus;

v4.0.0/templates/rmp-editor.php

@@ -2653,15 +2653,17 @@
 										'class'         => 'no-updates',
 										'name'          => 'menu[menu_width]',
 										'value'         => rmp_get_value( $options, 'menu_width' ),
+										'multi_device'  => true,
 										'group_classes' => 'full-size',
 										'placeholder'   => esc_html__( 'Enter value', 'responsive-menu' ),
 										'has_unit'      => array(
-											'unit_type' => 'all',
-											'id'        => 'rmp-menu-container-width-unit',
-											'name'      => 'menu[menu_width_unit]',
-											'default'   => '%',
-											'classes'   => 'is-unit no-updates',
-											'value'     => rmp_get_value( $options, 'menu_width_unit' ),
+											'unit_type'    => 'all',
+											'id'           => 'rmp-menu-container-width-unit',
+											'name'         => 'menu[menu_width_unit]',
+											'default'      => '%',
+											'classes'      => 'is-unit no-updates',
+											'value'        => rmp_get_value( $options, 'menu_width_unit' ),
+											'multi_device' => true,
 										),
 									)
 								);