Carrying the echo var through for the short-code implementation.

alleyinteractive · May 31, 2016 · d1eaec5 · d1eaec5
1 parent aba3ab4
commit d1eaec5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/php/ad-servers/class-ad-layers-ad-server.php b/php/ad-servers/class-ad-layers-ad-server.php
@@ -221,9 +221,9 @@ public function get_ad_units() {
  *
  * @access public
  */
- public function get_ad_unit( $ad_unit ) {
+ public function get_ad_unit( $ad_unit, $echo = true ) {
  if ( ! empty( $this->ad_server ) ) {
- $this->ad_server->get_ad_unit( $ad_unit );
+ $this->ad_server->get_ad_unit( $ad_unit, $echo );
  }
  }
 

diff --git a/php/class-ad-layers-shortcodes.php b/php/class-ad-layers-shortcodes.php
@@ -38,7 +38,10 @@ public function do_ad_unit( $atts, $content, $tag ) {
  // Attempt to display the specified ad unit.
  // This will just do nothing if the unit is invalid
  // or doesn't exist in the current ad layer.
- return Ad_Layers_Ad_Server::instance()->get_ad_unit( $atts['unit'] );
+ // Since the WP shortcode pattern is running and trying to replace
+ // our shortcode, we need to return the ad and what to replace there,
+ // so we set the echo value to false for get_ad_unit.
+ return Ad_Layers_Ad_Server::instance()->get_ad_unit( $atts['unit'], false );
  }
  }