WordPress.org
Get WordPress

Plugin Directory

Changeset 440390


Ignore:
Timestamp:
09/19/2011 07:33:53 PM (14 years ago)
Author:
JonBishop
Message:

Shortcodes can handle nested shortcodes

Location:
hubspot
Files:
44 added
7 edited

Legend:

Unmodified
Added
Removed

  • hubspot/trunk/hs-widgets.php

    r386368 r440390  
    8585        $action_ids =  implode(",", $action_array);
    8686
    87                 echo $myhubspotwp_action->hs_display_action($before_widget, $after_widget, $before_title, $after_title, $hide_title, $action_ids);
     87                echo do_shortcode($myhubspotwp_action->hs_display_action($before_widget, $after_widget, $before_title, $after_title, $hide_title, $action_ids));
    8888    }
    8989

  • hubspot/trunk/hubspot.php

    r425979 r440390  
    44Description: The HubSpot for WordPress plugin integrates the power of HubSpot with your WordPress site
    55Author: HubSpot
    6 Version: 1.5.3
     6Version: 1.5.4
    77Requires at least: 2.9
    88Author URI: http://www.hubspot.com

  • hubspot/trunk/inc/hs-action.php

    r425979 r440390  
    227227                        'id' => null,
    228228                ), $atts ) );
    229         $hs_content = $myhubspotwp->hs_format_text($this->hs_display_action('', '', '', '', true, $id));
     229        $hs_content = do_shortcode($this->hs_display_action('', '', '', '', true, $id));
     230               
    230231        return $hs_content;
    231232    }

  • hubspot/trunk/inc/hs-contact.php

    r383803 r440390  
    4141                        ), $atts));
    4242        $hs_content = $this->hs_get_contact_info($display, $name, $address, $citystate, $phone);
     43       
     44        // Check for nested shortcodes
     45        $hs_content = do_shortcode($hs_content);
     46               
    4347        return $hs_content;
    4448    }

  • hubspot/trunk/inc/hs-leads.php

    r419904 r440390  
    5959       
    6060        $hs_content = $myhubspotwp->hs_format_text($this->hs_get_form($id));
     61               
     62                // Check for nested shortcodes
     63                $hs_content = do_shortcode($hs_content);
     64               
    6165        return $hs_content;
    6266    }

  • hubspot/trunk/inc/hs-team.php

    r383803 r440390  
    2222                }
    2323        $hs_content = $this->hs_get_team_info($id);
     24               
     25                // Check for nested shortcodes
     26                $hs_content = do_shortcode($hs_content);
     27               
    2428        return $hs_content;
    2529    }

  • hubspot/trunk/readme.txt

    r425979 r440390  
    44Requires at least: 2.9
    55Tested up to: 3.2.1
    6 Stable tag: 1.5.3
     6Stable tag: 1.5.4
    77
    88Allows WordPress users to take advantage of HubSpot lead nurturing, website analytics, and assorted features of the HubSpot CMS.
    … …  
    173173
    174174== Changelog ==
     175= 1.5.4=
     176* Added support for nested shortcodes
     177
    175178= 1.5.3=
    176179* Fixed duplicate content on calls to action
Note: See TracChangeset for help on using the changeset viewer.