|  | @@ 494-496 (lines=3) @@ | 
                                                            
                                    | 491 |  | 		$args = wp_parse_args( $atts, $default ); | 
                                                            
                                    | 492 |  | 		$args['post_type'] = self::CUSTOM_POST_TYPE; // Force this post type | 
                                                            
                                    | 493 |  |  | 
                                                            
                                    | 494 |  | 		if ( false != $atts['include_type'] || false != $atts['include_tag'] ) { | 
                                                            
                                    | 495 |  | 			$args['tax_query'] = array(); | 
                                                            
                                    | 496 |  | 		} | 
                                                            
                                    | 497 |  |  | 
                                                            
                                    | 498 |  | 		// If 'include_type' has been set use it on the main query | 
                                                            
                                    | 499 |  | 		if ( false != $atts['include_type'] ) { | 
                                                                                
                                |  | @@ 516-518 (lines=3) @@ | 
                                                            
                                    | 513 |  | 			) ); | 
                                                            
                                    | 514 |  | 		} | 
                                                            
                                    | 515 |  |  | 
                                                            
                                    | 516 |  | 		if ( false != $atts['include_type'] && false != $atts['include_tag'] ) { | 
                                                            
                                    | 517 |  | 			$args['tax_query']['relation'] = 'AND'; | 
                                                            
                                    | 518 |  | 		} | 
                                                            
                                    | 519 |  |  | 
                                                            
                                    | 520 |  | 		// Run the query and return | 
                                                            
                                    | 521 |  | 		$query = new WP_Query( $args ); |