Disabled tags still render when using the Pane CTools content type

We have a bunch of tags rendering around the page on a site. 2 of these tags are embedded on the page using Display Suite which leverages the CTools content type API to render the tag as a "dfp_pane".

We have some other custom code which uses hook_dfp_tag_alter to disable all DFP slots on a page if a condition it met (in our case, if the body content contains a blacklisted keyword (to avoid Adsense violations)).

In this code, we do `$tag->disabled=TRUE` and this works for all blocks on the page.

However, the dfp_pane render callback does not respect this.

Our solution was to change the dfp_tag() function from:

  if (!$tag) {
    watchdog('dfp', 'Unknown ad tag %machinename passed to dfp_tag().', array('%machinename' => $machinename), WATCHDOG_WARNING);
  }
  else {

into

  if (!$tag) {
    watchdog('dfp', 'Unknown ad tag %machinename passed to dfp_tag().', array('%machinename' => $machinename), WATCHDOG_WARNING);
  }
  else if (!$tag->disabled) {