← All changes | helpers/shortcodes/grid_shortcode.php +2 -13 2.3 → 2.0 View file →

		@@ -26,15 +26,12 @@
26	26	$dynamic_rules = array();
27	27	if( count( $options ) > 0 && WPUltimatePostGrid::is_premium_active() ) {
28	28
29	29	if( isset( $options['post_id'] ) ) {
30		- $post_ids = str_replace( ',', ';', $options['post_id'] );
31		- $post_ids = str_replace( 'current_post', get_the_ID(), $post_ids );
32		-
33	30	$dynamic_rules[] = array(
34	31	'post_type' => 'wpupg_general',
35	32	'taxonomy' => 'id',
36		- 'values' => explode( ';', $post_ids ),
	33	+ 'values' => explode( ';', str_replace( ',', ';', $options['post_id'] ) ),
37	34	'type' => 'restrict',
38	35	);
39	36	unset( $options['post_id'] );
40	37	}
		@@ -39,15 +36,12 @@
39	36	unset( $options['post_id'] );
40	37	}
41	38
42	39	if( isset( $options['exclude_post_id'] ) ) {
43		- $post_ids = str_replace( ',', ';', $options['exclude_post_id'] );
44		- $post_ids = str_replace( 'current_post', get_the_ID(), $post_ids );
45		-
46	40	$dynamic_rules[] = array(
47	41	'post_type' => 'wpupg_general',
48	42	'taxonomy' => 'id',
49		- 'values' => explode( ';', $post_ids ),
	43	+ 'values' => explode( ';', str_replace( ',', ';', $options['exclude_post_id'] ) ),
50	44	'type' => 'exclude',
51	45	);
52	46	unset( $options['exclude_post_id'] );
53	47	}
		@@ -76,13 +70,8 @@
76	70	$posts .= $grid->draw_posts();
77	71	$posts .= '</div>';
78	72
79	73	$output = apply_filters( 'wpupg_posts_shortcode', $posts, $grid );
80		-
81		- // Message when no items match filter
82		- if( $grid->empty_message() ) {
83		- $output .= '<div id="wpupg-grid-' . esc_attr( $slug ) . '-empty" class="wpupg-grid-empty">' . $grid->empty_message() . '</div>';
84		- }
85	74
86	75	$pagination = '';
87	76	if( $grid->pagination_type() == 'pages' ) {
88	77	$pagination_type = $grid->pagination_type();