Skip to content

Commit

Permalink
Merge pull request #1136 from live-composer/release_1.5.43
Browse files Browse the repository at this point in the history
Release 1.5.43
  • Loading branch information
nitin-blueastral authored Jun 24, 2024
2 parents cf361fd + 94fd79b commit 4b9fa36
Show file tree
Hide file tree
Showing 4 changed files with 165 additions and 21 deletions.
4 changes: 2 additions & 2 deletions ds-live-composer.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Plugin URI: https://www.livecomposerplugin.com
* Description: Page builder for WordPress with drag and drop header/footer editing.
* Author: Live Composer Team
* Version: 1.5.42
* Version: 1.5.43
* Author URI: https://livecomposerplugin.com
* License: GPL3
* License URI: https://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -41,7 +41,7 @@
* Constants
*/

define( 'DS_LIVE_COMPOSER_VER', '1.5.42' );
define( 'DS_LIVE_COMPOSER_VER', '1.5.43' );

define( 'DS_LIVE_COMPOSER_SHORTNAME', __( 'Live Composer', 'live-composer-page-builder' ) );
define( 'DS_LIVE_COMPOSER_BASENAME', plugin_basename( __FILE__ ) );
Expand Down
14 changes: 7 additions & 7 deletions includes/display-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ function dslc_json_decode( $raw_code, $ignore_migration = false ) {

}
else{
$raw_code = maybe_unserialize( maybe_serialize($raw_code) );
$raw_code = unserialize( maybe_serialize($raw_code) ,['allowed_classes' => false]);

// Array already provided. Do nothing.
if ( is_array( $raw_code ) ) {
Expand Down Expand Up @@ -990,8 +990,8 @@ function dslc_json_decode( $raw_code, $ignore_migration = false ) {
} else {
// 1. it's old code of the module settings serialized + base64.
// Get array out of it.
$decoded = maybe_unserialize( $decoded_base64 );

$decoded = unserialize( $decoded_base64,['allowed_classes' => false] );
// Add a marker indicating that this module
// was imported from shortcode format.
if ( is_array( $decoded ) ) {
Expand Down Expand Up @@ -1465,12 +1465,12 @@ function dslc_modules_section_front( $atts, $content = null, $version = 1, $is_h

// Overlay Color.
if ( isset( $atts['bg_video_overlay_color'] ) && ! empty( $atts['bg_video_overlay_color'] ) ) {
$overlay_style .= 'background-color:' . $atts['bg_video_overlay_color'] . '; ';
$overlay_style .= 'background-color:' . esc_attr($atts['bg_video_overlay_color']) . '; ';
}

// Overlay Opacity.
if ( isset( $atts['bg_video_overlay_opacity'] ) && ! empty( $atts['bg_video_overlay_opacity'] ) ) {
$overlay_style .= 'opacity:' . $atts['bg_video_overlay_opacity'] . '; ';
$overlay_style .= 'opacity:' . esc_attr($atts['bg_video_overlay_opacity']) . '; ';
}

/**
Expand Down Expand Up @@ -1813,12 +1813,12 @@ function dslc_modules_area_front( $atts, $content = null, $version = 1, $is_head

$valign_class = '';
if ( isset( $atts['valign'] ) ) {
$valign_class = ' dslc-valign-' . $atts['valign'] . ' ';
$valign_class = ' dslc-valign-' . esc_attr($atts['valign']) . ' ';
} else {
$atts['valign'] = '';
}

$output = '<div class="dslc-modules-area dslc-col dslc-' . $atts['size'] . '-col ' . $pos_class . $valign_class . $admin_class . '" data-size="' . $atts['size'] . '" data-valign="' . $atts['valign'] . '">';
$output = '<div class="dslc-modules-area dslc-col dslc-' . $atts['size'] . '-col ' . $pos_class . $valign_class . $admin_class . '" data-size="' . $atts['size'] . '" data-valign="' . esc_attr($atts['valign']) . '">';

if ( $dslc_active && ! $is_header_footer && is_user_logged_in() && current_user_can( DS_LIVE_COMPOSER_CAPABILITY ) ) {

Expand Down
6 changes: 3 additions & 3 deletions modules/navigation/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ function dslc_nav_render_menu( $atts, $content = null ) {
$menu_class = 'menu';

if ( isset( $atts['theme_location'] ) ) {
$theme_location = $atts['theme_location'];
$theme_location = esc_attr($atts['theme_location']);
}

if ( isset( $atts['menu_class'] ) ) {
$menu_class = $atts['menu_class'];
$menu_class = esc_attr($atts['menu_class']);
}

ob_start();
Expand All @@ -94,7 +94,7 @@ function dslc_nav_render_mobile_menu( $atts, $content = null ) {
$theme_location = '';

if ( isset( $atts['theme_location'] ) ) {
$theme_location = $atts['theme_location'];
$theme_location = esc_attr($atts['theme_location']);
}

ob_start();
Expand Down
Loading

0 comments on commit 4b9fa36

Please sign in to comment.