← All changes | blocks/Post_Module_2.php +23 -25 2.1.1 → 2.2.5 View file →

		@@ -43,26 +43,25 @@
43	43	'queryTax' => [
44	44	'type' => 'string',
45	45	'default' => 'category'
46	46	],
47		- 'queryCat' => [
	47	+ 'queryTaxValue' => [
48	48	'type' => 'string',
49	49	'default' => '[]',
50	50	'style' => [
51	51	(object)[
52		- 'depends' => [(object)['key' => 'queryTax','condition' => '==','value' => 'category']]
	52	+ 'depends' => [(object)['key' => 'queryTax','condition' => '!=','value' => '']]
53	53	],
54	54	],
55	55	],
56		- 'queryTag' => [
	56	+ 'queryCat' => [ // for compatibility
57	57	'type' => 'string',
58		- 'default' => '[]',
59		- 'style' => [
60		- (object)[
61		- 'depends' => [(object)['key' => 'queryTax','condition' => '==','value' => 'post_tag']]
62		- ],
63		- ],
	58	+ 'default' => '[]'
64	59	],
	60	+ 'queryTag' => [ // for compatibility
	61	+ 'type' => 'string',
	62	+ 'default' => '[]'
	63	+ ],
65	64	'queryOrderBy' => [
66	65	'type' => 'string',
67	66	'default' => 'date',
68	67	],
		@@ -1043,9 +1042,9 @@
1043	1042	'depends' => [
1044	1043	(object)['key'=>'catShow','condition'=>'==','value'=>true],
1045	1044	(object)['key'=>'customCatColor','condition'=>'!=','value'=>true],
1046	1045	],
1047		- 'selector'=>'{{ULTP}} .ultp-category-grid a { color:{{catColor}}; }'
	1046	+ 'selector'=>'{{ULTP}} .ultp-block-item .ultp-category-grid a { color:{{catColor}}; }'
1048	1047	],
1049	1048	],
1050	1049	],
1051	1050	'catBgColor' => [
		@@ -1409,9 +1408,9 @@
1409	1408	'depends' => [(object)['key' => 'showImage','condition' => '==','value' => 'true']]
1410	1409	],
1411	1410	'imgCropSmall' => [
1412	1411	'type' => 'string',
1413		- 'default' => 'ultp_layout_square',
	1412	+ 'default' => (ultimate_post()->get_setting('disable_image_size') == 'yes' ? 'full' : 'ultp_layout_square'),
1414	1413	'depends' => [(object)['key' => 'showImage','condition' => '==','value' => 'true']]
1415	1414	],
1416	1415	'imgWidth' => [
1417	1416	'type' => 'object',
		@@ -1797,26 +1796,25 @@
1797	1796	'filterText' => [
1798	1797	'type' => 'string',
1799	1798	'default' => 'all'
1800	1799	],
1801		- 'filterCat' => [
	1800	+ 'filterValue' => [
1802	1801	'type' => 'string',
1803	1802	'default' => '[]',
1804	1803	'style' => [
1805	1804	(object)[
1806		- 'depends' => [(object)['key' => 'filterType','condition' => '==','value' => 'category']]
	1805	+ 'depends' => [(object)['key' => 'filterType','condition' => '!=','value' => '']]
1807	1806	],
1808	1807	],
1809	1808	],
1810		- 'filterTag' => [
	1809	+ 'filterCat' => [ // for compatibility
1811	1810	'type' => 'string',
1812		- 'default' => '[]',
1813		- 'style' => [
1814		- (object)[
1815		- 'depends' => [(object)['key' => 'filterType','condition' => '==','value' => 'post_tag']]
1816		- ],
1817		- ],
	1811	+ 'default' => '[]'
1818	1812	],
	1813	+ 'filterTag' => [ // for compatibility
	1814	+ 'type' => 'string',
	1815	+ 'default' => '[]'
	1816	+ ],
1819	1817	'fliterTypo' => [
1820	1818	'type' => 'object',
1821	1819	'default' => (object)['openTypography' => 1,'size' => (object)['lg' =>14, 'unit' =>'px'],'height' => (object)['lg' =>18, 'unit' =>'px'], 'decoration' => 'none','family'=>'','weight'=>500],
1822	1820	'style' => [
		@@ -2136,15 +2134,15 @@
2136	2134	],
2137	2135	],
2138	2136	'pagiHoverbg' => [
2139	2137	'type' => 'object',
2140		- 'default' => (object)['openColor' => 1, 'type' => 'color', 'color' => '#1740f5', 'replace'=>1],
	2138	+ 'default' => (object)['openColor' => 1, 'type' => 'color', 'color' => '#1740f5','replace'=>1],
2141	2139	'style' => [
2142	2140	(object)[
2143	2141	'depends' => [
2144	2142	(object)['key'=>'paginationShow','condition'=>'==','value'=>true],
2145	2143	],
2146		- 'selector'=>'{{ULTP}} .ultp-pagination li.pagination-active a, {{ULTP}} .ultp-next-prev-wrap ul li a:hover, {{ULTP}} .ultp-loadmore .ultp-loadmore-action:hover { {{pagiHoverbg}} } @media (min-width: 768px) { {{ULTP}} .ultp-pagination li a:hover { {{pagiHoverbg}} }}'
	2144	+ 'selector'=>'{{ULTP}} .ultp-pagination li a:hover, {{ULTP}} .ultp-pagination li.pagination-active a, {{ULTP}} .ultp-pagination-wrap .ultp-pagination li a:focus, {{ULTP}} .ultp-next-prev-wrap ul li a:hover, {{ULTP}} .ultp-loadmore-action:hover{ {{pagiHoverbg}} }'
2147	2145	],
2148	2146	],
2149	2147	],
2150	2148	'pagiHoverBorder' => [
		@@ -2178,9 +2176,9 @@
2178	2176	(object)[
2179	2177	'depends' => [
2180	2178	(object)['key'=>'paginationShow','condition'=>'==','value'=>true],
2181	2179	],
2182		- 'selector'=>'{{ULTP}} .ultp-pagination li a:hover, {{ULTP}} .ultp-next-prev-wrap ul li a:hover, {{ULTP}} .ultp-loadmore-action:hover { border-radius:{{pagiHoverRadius}}; }'
	2180	+ 'selector'=>'{{ULTP}} .ultp-pagination li.pagination-active a, {{ULTP}} .ultp-pagination li a:hover, {{ULTP}} .ultp-next-prev-wrap ul li a:hover, {{ULTP}} .ultp-loadmore-action:hover { border-radius:{{pagiHoverRadius}}; }'
2183	2181	],
2184	2182	],
2185	2183	],
2186	2184	'pagiPadding' => [
		@@ -2402,10 +2400,10 @@
2402	2400
2403	2401	public function content($attr, $noAjax) {
2404	2402
2405	2403	if(!$noAjax){
2406		- $paged = (get_query_var('paged')) ? get_query_var('paged') : 1;
2407		- $attr['paged'] = $paged;
	2404	+ $paged = is_front_page() ? get_query_var('page') : get_query_var('paged');
	2405	+ $attr['paged'] = $paged ? $paged : 1;
2408	2406	}
2409	2407
2410	2408	$block_name = 'post-module-2';
2411	2409	$page_post_id = get_the_ID();