Remove unrelated changes from this branch for feature-specific pull r…

…equest.
Automattic · Jul 23, 2013 · cb4de70 · cb4de70
1 parent 8bbe3ae
commit cb4de70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/ad-code-manager.php b/ad-code-manager.php
@@ -1076,8 +1076,8 @@ function shortcode( $atts ) {
 
 	/**
 	 * Allow ad sizes to be defined as arrays or as basic width x height.
-	 * The purpose of this is to solve for flex spaces, where multiple ad
-	 * sizes may be required to load in the same ad unit
+	 * The purpose of this is to solve for flex units, where multiple ad
+	 * sizes may be required to load in the same ad unit.
 	 */
 	function parse_ad_tag_sizes( $url_vars ) {
 		if ( empty( $url_vars ) ) 

diff --git a/providers/doubleclick-for-publishers-async.php b/providers/doubleclick-for-publishers-async.php
@@ -139,10 +139,6 @@ public function filter_output_html( $output_html, $tag_id ) {
 		switch ( $tag_id ) {
 		case 'dfp_head':
 			$ad_tags = $ad_code_manager->ad_tag_ids;
-
-			// Allow users to set targeting parameters
-			$set_targeting = apply_filters( 'acm_add_set_targets', '' );
-
 			ob_start();
 ?>
 	<!-- Include google_services.js -->