Merge pull request #89 from Automattic/use-is-callable

Use `is_callable` vs `function_exists`

Author: jtsternberg

ad-code-manager.php

@@ -962,7 +962,7 @@ public function get_matching_ad_code( $tag_id ) {
 
 				// Don't run the conditional if the conditional function doesn't exist or
 				// isn't in our whitelist
-				if ( !function_exists( $cond_func ) || !in_array( $cond_func, $this->whitelisted_conditionals ) )
+				if ( !is_callable( $cond_func ) || !in_array( $cond_func, $this->whitelisted_conditionals ) )
 					continue;
 
 				// Run our conditional and use any arguments that were passed

common/lib/acm-wp-list-table.php

@@ -224,8 +224,8 @@ function column_id( $item ) {
 			$column_id = 'acm-column[' . $slug . ']';
 			$output .= '<label for="' . esc_attr( $column_id ) . '">' . esc_html( $slug ) . '</label>';
 			// Support for select dropdowns
-			$ad_code_args = $ad_code_manager->current_provider->ad_code_args;
-			$ad_code_arg = array_shift( wp_filter_object_list( $ad_code_args, array( 'key' => $slug ) ) );
+			$ad_code_args = wp_filter_object_list( $ad_code_manager->current_provider->ad_code_args, array( 'key' => $slug ) );
+			$ad_code_arg = array_shift( $ad_code_args );
 			if ( isset( $ad_code_arg['type'] ) && 'select' == $ad_code_arg['type'] ) {
 				$output .= '<select name="' . esc_attr( $column_id ) . '">';
 				foreach ( $ad_code_arg['options'] as $key => $label ) {