Skip to content

Commit

Permalink
merge latest SD changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Stiofan
Stiofan committed Jul 11, 2024
1 parent c2744a4 commit c112832
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 18 deletions.
2 changes: 1 addition & 1 deletion includes/widgets/class-geodir-widget-dynamic-content.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ public function output( $args = array(), $widget_args = array(), $content = '' )
$output = '';
}

$output .= do_shortcode( $html );
$output = do_shortcode( $html );
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion vendor/ayecode/wp-super-duper/change-log.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
= 1.2.1 - TBD =
= 1.2.1 - 2024-07-10 =
* `html` argument not wrapped correctly in shortcode with new system for blocks - FIXED
* Hide advanced border options when border color selected to none - FIXED

= 1.2.0 - 2024-07-09 =
Expand Down
3 changes: 2 additions & 1 deletion vendor/ayecode/wp-super-duper/sd-functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3717,7 +3717,8 @@ function blockstrap_blocks_render_blocks($block_content, $parsed_block, $thiss )

// Check if ita a nested block that needs to be wrapped
if(! empty($parsed_block['attrs']['sd_shortcode_close'])){
$block_content = $parsed_block['attrs']['sd_shortcode'].$block_content.$parsed_block['attrs']['sd_shortcode_close'];
$content = isset($parsed_block['attrs']['html']) ? $parsed_block['attrs']['html'] : $block_content;
$block_content = $parsed_block['attrs']['sd_shortcode'].$content.$parsed_block['attrs']['sd_shortcode_close'];
}elseif(! empty($parsed_block['attrs']['sd_shortcode'])){
// Add the shortcode if its not a wrapped block
$block_content .= $parsed_block['attrs']['sd_shortcode'];
Expand Down
6 changes: 3 additions & 3 deletions vendor/ayecode/wp-super-duper/wp-super-duper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

if ( ! class_exists( 'WP_Super_Duper' ) ) {

define( 'SUPER_DUPER_VER', '1.2.0' );
define( 'SUPER_DUPER_VER', '1.2.1' );

/**
* A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
Expand Down Expand Up @@ -2654,7 +2654,7 @@ function sd_get_class_build_keys(){
echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
echo "sd_shortcode : {type : 'string',default: ''},";

if(!empty($this->options['nested-block'])){
if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
echo "sd_shortcode_close : {type : 'string',default: ''},";
}

Expand Down Expand Up @@ -3001,7 +3001,7 @@ function onChangeContent($type) {
props.setAttributes({sd_shortcode: shortcode});

<?php
if(!empty($this->options['nested-block'])){
if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
echo "props.setAttributes({sd_shortcode_close: '[/".esc_attr( $this->options['base_id'] )."]'});";
}
?>
Expand Down
14 changes: 7 additions & 7 deletions vendor/composer/installed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,24 +246,24 @@
},
{
"name": "ayecode/wp-super-duper",
"version": "1.2.0",
"version_normalized": "1.2.0.0",
"version": "1.2.1",
"version_normalized": "1.2.1.0",
"source": {
"type": "git",
"url": "https://github.com/AyeCode/wp-super-duper.git",
"reference": "0cd1521530d28872967b55e0b7e6a806fe19089c"
"reference": "4eba86b8827891ef0140bf667239f6fad2182d0c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/AyeCode/wp-super-duper/zipball/0cd1521530d28872967b55e0b7e6a806fe19089c",
"reference": "0cd1521530d28872967b55e0b7e6a806fe19089c",
"url": "https://api.github.com/repos/AyeCode/wp-super-duper/zipball/4eba86b8827891ef0140bf667239f6fad2182d0c",
"reference": "4eba86b8827891ef0140bf667239f6fad2182d0c",
"shasum": ""
},
"require": {
"composer/installers": "~1.0",
"php": ">=5.4.0"
},
"time": "2024-07-09T09:30:55+00:00",
"time": "2024-07-10T11:58:48+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
Expand Down Expand Up @@ -295,7 +295,7 @@
],
"support": {
"issues": "https://github.com/AyeCode/wp-super-duper/issues",
"source": "https://github.com/AyeCode/wp-super-duper/tree/1.2.0"
"source": "https://github.com/AyeCode/wp-super-duper/tree/1.2.1"
},
"install-path": "../ayecode/wp-super-duper"
},
Expand Down
10 changes: 5 additions & 5 deletions vendor/composer/installed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'name' => 'ayecode/geodirectory',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '0fa6d86253432d7b202f3785a897fd6dae2e83da',
'reference' => 'c2744a402ebdf96ac9e5758e7efbc7a4d4d37d38',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand All @@ -22,7 +22,7 @@
'ayecode/geodirectory' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '0fa6d86253432d7b202f3785a897fd6dae2e83da',
'reference' => 'c2744a402ebdf96ac9e5758e7efbc7a4d4d37d38',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand Down Expand Up @@ -65,9 +65,9 @@
'dev_requirement' => false,
),
'ayecode/wp-super-duper' => array(
'pretty_version' => '1.2.0',
'version' => '1.2.0.0',
'reference' => '0cd1521530d28872967b55e0b7e6a806fe19089c',
'pretty_version' => '1.2.1',
'version' => '1.2.1.0',
'reference' => '4eba86b8827891ef0140bf667239f6fad2182d0c',
'type' => 'library',
'install_path' => __DIR__ . '/../ayecode/wp-super-duper',
'aliases' => array(),
Expand Down

0 comments on commit c112832

Please sign in to comment.