Zen Menu Logic not working with New Enfold Mobile Menu

Hi,
There are two new fixes for the Zen menu logic plugin.
1) in enfold/functions-enfold.php on line 163 find:

if( class_exists( 'ZenOfWPMenuLogic' ) )

change to

if( class_exists( 'ZenOfWPMenuLogic' ) || class_exists( 'Themify_Conditional_Menus' ) )

2) For Zen Menu Logic breaks burger menu icon, in /enfold/functions-enfold.php on line 131 just above:

/* Append the burger menu */

add

/* Fix for Zen Menu Logic plugin - removes theme location from menu array to exchange the menus */
 if( ! function_exists( 'avia_save_menu_location' ) )
 {
 	add_filter('wp_nav_menu_args', 'avia_save_menu_location', 1, 1 );
 	
 	function avia_save_menu_location( $args )
 	{
 		global $avia_config;
 		
 		$avia_config['current_menu_location_output'] = isset( $args['theme_location'] ) ? $args['theme_location'] : '';
 		
 		return $args;
 	}
 }

also on line 141 change:

if ((is_object($args) && $args->theme_location == 'avia') || (is_string($args) && $args = "fallback_menu"))

to

global $avia_config;
 		
 		$location = ( is_object( $args ) && isset( $args->theme_location ) ) ? $args->theme_location : '';
 		
 		/*	Bugfix for for Zen Menu Logic plugin - removed theme location from menu array to exchange the menus		*/
 		if( class_exists( 'ZenOfWPMenuLogic' ) )
 		{
 			$location = isset( $avia_config['current_menu_location_output'] ) ? $avia_config['current_menu_location_output'] : '';
 		}
 		
 	    if ((is_object($args) && $location == 'avia') || (is_string($args) && $args = "fallback_menu"))

If you feel un-comfortable with these changes, you can wait for the next update to include them.
Please backup files before making changes.

Best regards,
Mike

Hi,

Please update file enfold\functions-enfold.php. Please replace the complete content of this file with the RAW paste content of

https://pastebin.com/wD44ahLU

This link is valid for one week. Make sure to make a copy of the original file to have a fallback and that you are using Enfold 4.1.2.

Please clear your browser cache, Server cache and reload the page (sometimes you need to close the browser and reopen a new browser window and reload the page several times).

If you have problem we can do the update for you, please give us FTP access to your server.

Best regards,
Günter